From: Morgan Deters Date: Tue, 17 Jun 2014 20:58:43 +0000 (-0400) Subject: No more dependence on libstdc++ or PBDS stuff: remove build stuff that supported it. X-Git-Tag: cvc5-1.0.0~6758^2~15 X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=8a60fd352273ccafcdfd7b0582182444f9a19183;p=cvc5.git No more dependence on libstdc++ or PBDS stuff: remove build stuff that supported it. --- diff --git a/configure.ac b/configure.ac index 57e5d46dc..e30c12a6f 100644 --- a/configure.ac +++ b/configure.ac @@ -795,43 +795,6 @@ void foo(int64_t) {}])], AC_LANG_POP([C++]) AC_SUBST([CVC4_NEED_INT64_T_OVERLOADS]) -AC_MSG_CHECKING([for the pb_ds namespace]) -AC_LANG_PUSH([C++]) -AC_COMPILE_IFELSE([AC_LANG_SOURCE([ -#include -typedef pb_ds::priority_queue pq;])], - [CVC4_PB_DS_NAMESPACE=pb_ds], - [AC_COMPILE_IFELSE([AC_LANG_SOURCE([ - #include - typedef __gnu_pbds::priority_queue pq;])], - [CVC4_PB_DS_NAMESPACE=__gnu_pbds], - [AC_MSG_ERROR([cannot find required priority_queue in either __gnu_pbds or pb_ds namespace. - -If you're using a non-GCC compiler (such as clang), you may need to explicitly -use the GNU standard C++ library by passing: - CXXFLAGS='-stdlib=libstdc++' CPPFLAGS='-stdlib=libstdc++' -as arguments to this configure script. -This is the case on Mac OS Mavericks, for example.])])]) -AC_LANG_POP([C++]) -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 -])], - [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