portability updates to build system

diff --git a/Makefile b/Makefile
index bf95f419ecabd722b0f3dfa9ae66d780fef419b4..19cd9712bc919722ba33561e3340b7230561ffc7 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -3,7 +3,7 @@ builddir = builds
 .PHONY: _default_build_ all
 _default_build_: all
 all %:
-       @if test -e $(builddir); then \
+       @if test -d $(builddir); then \
                echo cd $(builddir); \
                cd $(builddir); \
                echo $(MAKE) $@; \

diff --git a/README b/README
index f058c3852aaf772b2657b4c2309d673cebb54237..f4178844d1a954e9e2cb7d409f53e7dd8e64dd60 100644 (file)
--- a/README
+++ b/README
@@ -18,6 +18,8 @@ are necessary for an independent install.
 The following tools and libraries are required to run CVC4. Versions
 given are minimum versions; more recent versions should be compatible.
 
+GNU C and C++ (gcc and g++), reasonably recent versions
+GNU Make
 GMP v4.2
 libantlr3c v3.2
 Optional: CLN v1.3

diff --git a/config/mkbuilddir b/config/mkbuilddir
index 1bc8955483e8c478e48d5d4a528fdeb74971ddb4..252f17ea5185cc012b8e8d2c21a88601ff2b6dae 100755 (executable)
--- a/config/mkbuilddir
+++ b/config/mkbuilddir
@@ -21,19 +21,19 @@ fi
 target=$1
 build_type=$2
 
-echo Setting up "builds/$target/$build_type"...
-rm -fv config.log config.status confdefs.h
-mkdir -pv "builds/$target/$build_type"
-ln -sfv "$target/$build_type/Makefile.builds" builds/Makefile
+$as_echo "Setting up builds/$target/$build_type..."
+$RM config.log config.status confdefs.h builds/Makefile
+$MKDIR_P "builds/$target/$build_type"
+$LN_S "$target/$build_type/Makefile.builds" builds/Makefile
 
-echo Creating builds/current...
+$as_echo "Creating builds/current..."
 (echo "# This is the most-recently-configured CVC4 build"; \
  echo "# 'make' in the top-level source directory applies to this build"; \
  echo "CURRENT_BUILD = $target/$build_type") > builds/current
 
 for dir in src test; do
-  echo Linking builds/$dir...
-  rm -f "builds/$dir"
-  ln -sfv "$target/$build_type/$dir" "builds/$dir"
+  $as_echo "Linking builds/$dir..."
+  $RM "builds/$dir"
+  $LN_S "$target/$build_type/$dir" "builds/$dir"
 done
 

diff --git a/configure.ac b/configure.ac
index feb0be86c358ddf14f62c7b9c6b65e69ad88bef7..60125834278ed0cecfe433a9ea45ba4bf5494c53 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -282,18 +282,18 @@ if test "$CVC4_CONFIGURE_IN_BUILDS" = yes; then
   AC_MSG_RESULT([this one (in builds/)])
 elif test "$CVC4_CONFIGURE_AT_TOP_LEVEL" = yes; then
   AC_MSG_RESULT([builds/$target/$build_type])
-  echo
+  $as_echo
   if test -z "$ac_srcdir"; then
     mkbuilddir=./config/mkbuilddir
   else
     mkbuilddir=$ac_srcdir/config/mkbuilddir
   fi
-  echo $mkbuilddir "$target" "$build_type"
-  $mkbuilddir "$target" "$build_type"
-  echo cd "builds/$target/$build_type"
+  $as_echo "$mkbuilddir $target $build_type"
+  source $mkbuilddir "$target" "$build_type"
+  $as_echo "cd builds/$target/$build_type"
   cd "builds/$target/$build_type"
   CVC4_CONFIGURE_IN_BUILDS=yes; export CVC4_CONFIGURE_IN_BUILDS
-  echo ../../../configure $config_cmdline
+  $as_echo "../../../configure $config_cmdline"
   `pwd`/../../../configure $config_cmdline
   exitval=$?
   cd ../../..
@@ -604,7 +604,7 @@ AC_PATH_PROG(CXXTESTGEN, cxxtestgen.pl, [], [$CXXTEST:$PATH])
 if test -z "$CXXTESTGEN"; then
   AC_MSG_NOTICE([unit tests disabled, cxxtestgen.pl not found.])
 elif test -z "$CXXTEST"; then
-  CXXTEST=$(dirname "$CXXTESTGEN")
+  CXXTEST=`dirname "$CXXTESTGEN"`
   AC_MSG_CHECKING([for location of CxxTest headers])
   if test -e "$CXXTEST/cxxtest/TestRunner.h"; then
     AC_MSG_RESULT([$CXXTEST])