diff options
-rw-r--r-- | ChangeLog | 4 | ||||
-rw-r--r-- | config/open-axiom.m4 | 2 | ||||
-rw-r--r-- | config/openaxiom-c-macros.h.in | 6 | ||||
-rwxr-xr-x | configure | 115 |
4 files changed, 27 insertions, 100 deletions
@@ -1,3 +1,7 @@ +2011-07-05 Gabriel Dos Reis <gdr@cs.tamu.edu> + + * config/open-axiom.m4: Don't test for GMP, just yet. + 2011-07-04 Gabriel Dos Reis <gdr@cs.tamu.edu> * configure.ac: Use macx-g++ spec for QT when building for darwin diff --git a/config/open-axiom.m4 b/config/open-axiom.m4 index feb30740..2e8ef1a2 100644 --- a/config/open-axiom.m4 +++ b/config/open-axiom.m4 @@ -796,7 +796,7 @@ OPENAXIOM_CHECK_FILESYSTEM OPENAXIOM_CHECK_SIGNALS OPENAXIOM_CHECK_SOCKETS OPENAXIOM_CHECK_PROCESS -OPENAXIOM_CHECK_GMP +#OPENAXIOM_CHECK_GMP ]) dnl ------------------------ diff --git a/config/openaxiom-c-macros.h.in b/config/openaxiom-c-macros.h.in index d2e0d23e..1eb6df78 100644 --- a/config/openaxiom-c-macros.h.in +++ b/config/openaxiom-c-macros.h.in @@ -54,9 +54,6 @@ /* Define to 1 if you have the <fcntl.h> header file. */ #undef HAVE_FCNTL_H -/* Define to 1 if you have the <gmp.h> header file. */ -#undef HAVE_GMP_H - /* Define to 1 if the system has the type `int16_t'. */ #undef HAVE_INT16_T @@ -78,9 +75,6 @@ /* Define to 1 if you have the <inttypes.h> header file. */ #undef HAVE_INTTYPES_H -/* Define to 1 if you have the `gmp' library (-lgmp). */ -#undef HAVE_LIBGMP - /* Define to 1 if you have the <libutil.h> header file. */ #undef HAVE_LIBUTIL_H @@ -770,8 +770,6 @@ X_CFLAGS XMKMF OA_BUILD_SMAN_FALSE OA_BUILD_SMAN_TRUE -OA_HAS_GMP_FALSE -OA_HAS_GMP_TRUE oa_c_runtime_extra oa_c_runtime MAKEINDEX @@ -9082,13 +9080,13 @@ if test "${lt_cv_nm_interface+set}" = set; then : else lt_cv_nm_interface="BSD nm" echo "int some_variable = 0;" > conftest.$ac_ext - (eval echo "\"\$as_me:9085: $ac_compile\"" >&5) + (eval echo "\"\$as_me:9083: $ac_compile\"" >&5) (eval "$ac_compile" 2>conftest.err) cat conftest.err >&5 - (eval echo "\"\$as_me:9088: $NM \\\"conftest.$ac_objext\\\"\"" >&5) + (eval echo "\"\$as_me:9086: $NM \\\"conftest.$ac_objext\\\"\"" >&5) (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out) cat conftest.err >&5 - (eval echo "\"\$as_me:9091: output\"" >&5) + (eval echo "\"\$as_me:9089: output\"" >&5) cat conftest.out >&5 if $GREP 'External.*some_variable' conftest.out > /dev/null; then lt_cv_nm_interface="MS dumpbin" @@ -10291,7 +10289,7 @@ ia64-*-hpux*) ;; *-*-irix6*) # Find out which ABI we are using. - echo '#line 10294 "configure"' > conftest.$ac_ext + echo '#line 10292 "configure"' > conftest.$ac_ext if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -12384,11 +12382,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:12387: $lt_compile\"" >&5) + (eval echo "\"\$as_me:12385: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:12391: \$? = $ac_status" >&5 + echo "$as_me:12389: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -12723,11 +12721,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:12726: $lt_compile\"" >&5) + (eval echo "\"\$as_me:12724: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:12730: \$? = $ac_status" >&5 + echo "$as_me:12728: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -12828,11 +12826,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:12831: $lt_compile\"" >&5) + (eval echo "\"\$as_me:12829: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:12835: \$? = $ac_status" >&5 + echo "$as_me:12833: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -12883,11 +12881,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:12886: $lt_compile\"" >&5) + (eval echo "\"\$as_me:12884: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:12890: \$? = $ac_status" >&5 + echo "$as_me:12888: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -15250,7 +15248,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 15253 "configure" +#line 15251 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -15346,7 +15344,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 15349 "configure" +#line 15347 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -17302,11 +17300,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:17305: $lt_compile\"" >&5) + (eval echo "\"\$as_me:17303: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:17309: \$? = $ac_status" >&5 + echo "$as_me:17307: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -17401,11 +17399,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:17404: $lt_compile\"" >&5) + (eval echo "\"\$as_me:17402: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:17408: \$? = $ac_status" >&5 + echo "$as_me:17406: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -17453,11 +17451,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:17456: $lt_compile\"" >&5) + (eval echo "\"\$as_me:17454: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:17460: \$? = $ac_status" >&5 + echo "$as_me:17458: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -19486,72 +19484,7 @@ cat >>confdefs.h <<_ACEOF _ACEOF - -for ac_header in gmp.h -do : - ac_fn_cxx_check_header_mongrel "$LINENO" "gmp.h" "ac_cv_header_gmp_h" "$ac_includes_default" -if test "x$ac_cv_header_gmp_h" = x""yes; then : - cat >>confdefs.h <<_ACEOF -#define HAVE_GMP_H 1 -_ACEOF - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for __gmpz_init in -lgmp" >&5 -$as_echo_n "checking for __gmpz_init in -lgmp... " >&6; } -if test "${ac_cv_lib_gmp___gmpz_init+set}" = set; then : - $as_echo_n "(cached) " >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lgmp $LIBS" -cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char __gmpz_init (); -int -main () -{ -return __gmpz_init (); - ; - return 0; -} -_ACEOF -if ac_fn_cxx_try_link "$LINENO"; then : - ac_cv_lib_gmp___gmpz_init=yes -else - ac_cv_lib_gmp___gmpz_init=no -fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_gmp___gmpz_init" >&5 -$as_echo "$ac_cv_lib_gmp___gmpz_init" >&6; } -if test "x$ac_cv_lib_gmp___gmpz_init" = x""yes; then : - cat >>confdefs.h <<_ACEOF -#define HAVE_LIBGMP 1 -_ACEOF - - LIBS="-lgmp $LIBS" - -fi - -fi - -done - - if test -n $ac_cv_header_gmp_h; then - OA_HAS_GMP_TRUE= - OA_HAS_GMP_FALSE='#' -else - OA_HAS_GMP_TRUE='#' - OA_HAS_GMP_FALSE= -fi - - +#OPENAXIOM_CHECK_GMP # Honor support for large files @@ -21208,10 +21141,6 @@ if test -z "${am__fastdepCXX_TRUE}" && test -z "${am__fastdepCXX_FALSE}"; then as_fn_error "conditional \"am__fastdepCXX\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi -if test -z "${OA_HAS_GMP_TRUE}" && test -z "${OA_HAS_GMP_FALSE}"; then - as_fn_error "conditional \"OA_HAS_GMP\" was never defined. -Usually this means the macro was only invoked conditionally." "$LINENO" 5 -fi if test -z "${OA_BUILD_SMAN_TRUE}" && test -z "${OA_BUILD_SMAN_FALSE}"; then as_fn_error "conditional \"OA_BUILD_SMAN\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 @@ -23732,7 +23661,7 @@ if test x$oa_has_qt = xyes; then oa_qmake_spec="-spec macx-g++" ;; esac - (cd src/gui && $OA_QT_QMAKE $oa_qmake_spec -makefile gui.pro) + (cd src/gui && $OA_QT_QMAKE -makefile $oa_qmake_spec gui.pro) fi ## Generate rules to extrad SPAD type definitions from pamphlets. |