fix debian build without breaking anything (i hope)

diff --git a/config/cvc4.m4 b/config/cvc4.m4
index 4adc88c61280863d551de0b2462794e89b3eb3e1..1138a2c4e7fe3e6500f23754b5f0e45ba003ed2e 100644 (file)
--- a/config/cvc4.m4
+++ b/config/cvc4.m4
@@ -54,7 +54,7 @@ do
       done
       ac_option="--with-build=$ac_option_build"
   esac
-  eval 'ac_cvc4_rewritten_args="${ac_cvc4_rewritten_args+$ac_cvc4_rewritten_args }\"$ac_option\""'
+  eval 'ac_cvc4_rewritten_args="${ac_cvc4_rewritten_args+$ac_cvc4_rewritten_args }'\'\$ac_option\'\"
 done
 eval set x $ac_cvc4_rewritten_args
 shift

diff --git a/configure.ac b/configure.ac
index fdacfeb7f33dfa063a6509d67de1ec630b0cc908..3205d9a3f26e3adedaf577707f64f2d1d29326ce 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -53,7 +53,7 @@ CVC4_BINDINGS_LIBRARY_VERSION=0:0:0
 # we save it.  (We can't do our build profile stuff here, or it's not
 # included in the output... autoconf overrides us on the orderings of
 # some things.)
-config_cmdline="$@"
+config_cmdline=("$@")
 
 # remember if the user set these explicitly (or whether autoconf does)
 user_specified_enable_or_disable_static=${enable_static+yes}
@@ -310,8 +310,8 @@ elif test "$CVC4_CONFIGURE_AT_TOP_LEVEL" = yes; then
   $as_echo "cd builds/$target/$build_type"
   cd "builds/$target/$build_type"
   CVC4_CONFIGURE_IN_BUILDS=yes; export CVC4_CONFIGURE_IN_BUILDS
-  $as_echo "../../../configure $config_cmdline"
-  `pwd`/../../../configure $config_cmdline
+  echo "../../../configure ${config_cmdline[[@]]}"
+  `pwd`/../../../configure "${config_cmdline[[@]]}"
   exitval=$?
   cd ../../..
   if test $exitval -eq 0; then
@@ -831,6 +831,9 @@ AC_SUBST(STATIC_BINARY)
 AM_CONDITIONAL([STATIC_BINARY], [test "$enable_static_binary" = yes])
 AM_CONDITIONAL([COVERAGE_ENABLED], [test "$enable_coverage" = yes])
 
+AM_CONDITIONAL([CVC4_DEBUG], [test "$with_build" = debug])
+AM_CONDITIONAL([CVC4_TRACING], [test "$enable_tracing" = yes])
+
 AC_SUBST(CVC4_LIBRARY_VERSION)
 AC_SUBST(CVC4_PARSER_LIBRARY_VERSION)
 AC_SUBST(CVC4_COMPAT_LIBRARY_VERSION)