Fix build system for Mac OS X builds (resolves bug #203)

diff --git a/configure.ac b/configure.ac
index d369cbde540f1c0a921e5e39bb68992d9a2c3693..b567afedafba878ca2fb477827d6fb10294b7ddb 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -65,6 +65,9 @@ fi
 if test -z "${CFLAGS+set}"; then CFLAGS=; fi
 if test -z "${CXXFLAGS+set}"; then CXXFLAGS=; fi
 
+# on by default
+AM_MAINTAINER_MODE
+
 # turn off static lib building by default
 AC_ENABLE_SHARED
 AC_DISABLE_STATIC
@@ -636,7 +639,7 @@ fi
 AC_CHECK_LIB(z, gzread, , [AC_MSG_ERROR([zlib required, install your distro's zlib-dev package or see www.zlib.net])])
 AC_CHECK_HEADER(zlib.h, , [AC_MSG_ERROR([zlib required, install your distro's zlib-dev package or see www.zlib.net])])
 
-AC_CHECK_LIB(rt, clock_gettime, , [AC_MSG_ERROR([can't find clock_gettime() in librt])])
+#AC_CHECK_LIB(rt, clock_gettime, , [AC_MSG_ERROR([can't find clock_gettime() in librt])])
 
 # Check for antlr C++ runtime (defined in config/antlr.m4)
 AC_LIB_ANTLR
@@ -720,7 +723,7 @@ AC_SUBST(CVC4_USE_GMP_IMP)
 AC_CONFIG_FILES([
   Makefile.builds
   Makefile]
-  m4_esyscmd([find contrib/ src/ test/ -name Makefile.am | sort | sed 's,\.am$,,'])
+  m4_esyscmd([find contrib src test -name Makefile.am | sort | sed 's,\.am$,,'])
   src/util/rational.h
   src/util/integer.h
 )

diff --git a/src/expr/mkmetakind b/src/expr/mkmetakind
index 079bea861676df2072081a383f8145f22e9f3af0..89e2861d650bc330598346ec0627c14b64d1c52e 100755 (executable)
--- a/src/expr/mkmetakind
+++ b/src/expr/mkmetakind
@@ -210,13 +210,13 @@ function register_metakind {
 ";
 
   # figure out the range given by $nc
-  if expr "$nc" : '[0-9]\+$' >/dev/null; then
+  if expr "$nc" : '[0-9][0-9]*$' >/dev/null; then
     lb=$nc
     ub=$nc
-  elif expr "$nc" : '[0-9]\+:$' >/dev/null; then
+  elif expr "$nc" : '[0-9][0-9]*:$' >/dev/null; then
     let `echo "$nc" | awk 'BEGIN{FS=":"}{print"lb="$1}'`
     ub=MAX_CHILDREN
-  elif expr "$nc" : '[0-9]\+:[0-9]\+$' >/dev/null; then
+  elif expr "$nc" : '[0-9][0-9]*:[0-9][0-9]*$' >/dev/null; then
     let `echo "$nc" | awk 'BEGIN{FS=":"}{print"lb="$1" ub="$2}'`
     if [ $ub -lt $lb ]; then
       echo "$kf:$lineno: error in range \`$nc': LB < UB (in definition of $k)" >&2

diff --git a/src/theory/Makefile.subdirs b/src/theory/Makefile.subdirs
index eafb350ae35ecb1a2cc5211a929d2c24b0040583..99adc7d0ddab90cd14e55ff460b3992841a428d8 100644 (file)
--- a/src/theory/Makefile.subdirs
+++ b/src/theory/Makefile.subdirs
@@ -1,5 +1,5 @@
 $(top_builddir)/src/theory/.subdirs: $(top_srcdir)/src/theory/Makefile.am
-       $(AM_V_at)grep '^SUBDIRS = ' $(top_srcdir)/src/theory/Makefile.am | cut -d' ' -f3- | tr ' ' "\n" | xargs -i__D__ echo $(top_srcdir)/src/theory/__D__/kinds >$(top_builddir)/src/theory/.subdirs.tmp
+       $(AM_V_at)grep '^SUBDIRS = ' $(top_srcdir)/src/theory/Makefile.am | cut -d' ' -f3- | tr ' ' "\n" | xargs -I__D__ echo $(top_srcdir)/src/theory/__D__/kinds >$(top_builddir)/src/theory/.subdirs.tmp
        @if ! diff -q $(top_builddir)/src/theory/.subdirs $(top_builddir)/src/theory/.subdirs.tmp &>/dev/null; then \
                echo "  GEN   " $@; \
                $(am__mv) $(top_builddir)/src/theory/.subdirs.tmp $(top_builddir)/src/theory/.subdirs; \