diff options
| author | Morgan Deters <mdeters@gmail.com> | 2010-09-24 21:20:33 +0000 |
|---|---|---|
| committer | Morgan Deters <mdeters@gmail.com> | 2010-09-24 21:20:33 +0000 |
| commit | 2e1581b5840cb131b416718bc1506edfb833f5f0 (patch) | |
| tree | ebe742795f919ca404c438d4eed38929dd567e1f | |
| parent | 353c6d5c3770365f0dffcbdf697199bed156cf50 (diff) | |
Fix build system for Mac OS X builds (resolves bug #203)
| -rw-r--r-- | configure.ac | 7 | ||||
| -rwxr-xr-x | src/expr/mkmetakind | 6 | ||||
| -rw-r--r-- | src/theory/Makefile.subdirs | 2 |
3 files changed, 9 insertions, 6 deletions
diff --git a/configure.ac b/configure.ac index d369cbde5..b567afeda 100644 --- 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 079bea861..89e2861d6 100755 --- 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 eafb350ae..99adc7d0d 100644 --- 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; \ |