diff options
| author | Morgan Deters <mdeters@gmail.com> | 2010-10-01 21:35:31 +0000 |
|---|---|---|
| committer | Morgan Deters <mdeters@gmail.com> | 2010-10-01 21:35:31 +0000 |
| commit | 96d1c3daff7efdd2d853864fb820bc7cf413624e (patch) | |
| tree | b995c98a2be18182d6cb52e81de5bf712b475f06 /configure.ac | |
| parent | d0b49d588033ab8140bdf297c9cdf73b1088fe68 (diff) | |
replacement implementation for clock_gettime() on mac os x, build portability (resolving mac os x issues), code cleanup, fix compiler warnings
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/configure.ac b/configure.ac index f22ae595a..249122d25 100644 --- a/configure.ac +++ b/configure.ac @@ -14,6 +14,7 @@ AC_INIT([cvc4], _CVC4_RELEASE_STRING) AC_CONFIG_SRCDIR([src/include/cvc4_public.h]) AC_CONFIG_AUX_DIR([config]) AC_CONFIG_MACRO_DIR([config]) +AC_CONFIG_LIBOBJ_DIR([src/lib]) m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])]) @@ -639,7 +640,10 @@ 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_SEARCH_LIBS([clock_gettime], [rt], + [AC_DEFINE([HAVE_CLOCK_GETTIME], [1], + [Defined to 1 if clock_gettime() is supported by the platform.])], + [AC_LIBOBJ([clock_gettime])]) # Check for antlr C++ runtime (defined in config/antlr.m4) AC_LIB_ANTLR @@ -656,7 +660,7 @@ AC_CHECK_HEADERS([getopt.h unistd.h]) #AC_TYPE_SIZE_T # Check for availability of TLS support (e.g. __thread storage class) -AC_MSG_CHECKING([whether user wants wants to use compiler-supported TLS]) +AC_MSG_CHECKING([whether to use compiler-supported TLS if available]) AC_ARG_ENABLE([tls], AS_HELP_STRING([--disable-tls], [don't use compiler-native TLS])) if test -z "${enable_tls+set}" || test "$enable_tls" = "yes"; then AC_MSG_RESULT([yes]) @@ -701,7 +705,7 @@ AC_DEFINE_UNQUOTED(CVC4_RELEASE_STRING, ["${CVC4_RELEASE_STRING}"], [Full releas CPPFLAGS="${CPPFLAGS:+$CPPFLAGS }$CVC4CPPFLAGS" CXXFLAGS="${CXXFLAGS:+$CXXFLAGS }$CVC4CXXFLAGS -Wno-deprecated" -CFLAGS="${CFLAGS:+$CFLAGS }$CVC4CFLAGS -Wno-deprecated -fexceptions" +CFLAGS="${CFLAGS:+$CFLAGS }$CVC4CFLAGS -fexceptions" LDFLAGS="${LDFLAGS:+$LDFLAGS }$CVC4LDFLAGS" AC_SUBST(FLAG_VISIBILITY_HIDDEN) @@ -742,7 +746,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 lib src test -name Makefile.am | sort | sed 's,\.am$,,']) src/util/rational.h src/util/integer.h src/util/tls.h |