diff options
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 27 |
1 files changed, 25 insertions, 2 deletions
diff --git a/configure.ac b/configure.ac index ca868c0d0..e860461b9 100644 --- a/configure.ac +++ b/configure.ac @@ -761,10 +761,26 @@ typedef pb_ds::priority_queue<void, void, void> pq;])], #include <ext/pb_ds/priority_queue.hpp> typedef __gnu_pbds::priority_queue<void, void, void> pq;])], [CVC4_PB_DS_NAMESPACE=__gnu_pbds], - [AC_MSG_ERROR([can't find required priority_queue in either __gnu_pbds or pb_ds namespace])])]) + [AC_MSG_ERROR([cannot find required priority_queue in either __gnu_pbds or pb_ds namespace])])]) AC_LANG_POP([C++]) -AC_DEFINE_UNQUOTED(CVC4_PB_DS_NAMESPACE, ${CVC4_PB_DS_NAMESPACE}, [The namespace for pb_ds data structures.]) AC_MSG_RESULT([$CVC4_PB_DS_NAMESPACE]) +AC_DEFINE_UNQUOTED(CVC4_PB_DS_NAMESPACE, ${CVC4_PB_DS_NAMESPACE}, [The namespace for pb_ds data structures.]) + +# for information: http://gcc.gnu.org/bugzilla/show_bug.cgi?id=36612 +AC_MSG_CHECKING([whether pb_ds has bug 36612]) +AC_LANG_PUSH([C++]) +AC_COMPILE_IFELSE([AC_LANG_SOURCE([ +#define __throw_container_error inline __throw_container_error +#define __throw_insert_error inline __throw_insert_error +#define __throw_join_error inline __throw_join_error +#define __throw_resize_error inline __throw_resize_error +#include <ext/pb_ds/exception.hpp> +])], + [CVC4_GCC_HAS_PB_DS_BUG=1; bugverb=is], + [CVC4_GCC_HAS_PB_DS_BUG=0; bugverb="is not"]) +AC_LANG_POP([C++]) +AC_MSG_RESULT([bug $bugverb present]) +AC_DEFINE_UNQUOTED(CVC4_GCC_HAS_PB_DS_BUG, ${CVC4_GCC_HAS_PB_DS_BUG}, [Whether libstdc++ has a certain bug; see http://gcc.gnu.org/bugzilla/show_bug.cgi?id=36612]) # Check for ANTLR runantlr script (defined in config/antlr.m4) AC_PROG_ANTLR @@ -1123,6 +1139,13 @@ if test "$cvc4_build_java_bindings"; then fi fi +# on Mac OS X, Java doesn't like the .so module extension; it wants .dylib +module=no eval CVC4_JAVA_MODULE_EXT="$shrext_cmds" +if test -z "$CVC4_JAVA_MODULE_EXT"; then + CVC4_JAVA_MODULE_EXT=.so +fi +AC_SUBST([CVC4_JAVA_MODULE_EXT]) + # Prepare configure output if test "$enable_shared" = yes; then BUILDING_SHARED=1; else BUILDING_SHARED=0; fi |