Changeset 3252 for ThirdParty/Glpk/branches

Timestamp:

Jun 29, 2014 10:11:29 PM (6 years ago)

Author:

stefan

Message:

reenable check for gmp

Location:

ThirdParty/Glpk/branches/autotools-update

Files:

• config_glpk.h.in (modified) (2 diffs)
• configure (modified) (4 diffs)
• configure.ac (modified) (2 diffs)

ThirdParty/Glpk/branches/autotools-update/config_glpk.h.in

@@ -1 +1 @@
 /* config_glpk.h.in.  Generated from configure.ac by autoheader.  */
+
+/* Define to 1 if GMP is available */
+#undef COIN_HAS_GMP
 
 /* SVN revision number of project */
@@ -21 +24 @@
 /* Define to 1 if you have the <dlfcn.h> header file. */
 #undef HAVE_DLFCN_H
+
+/* Define to 1 if GMP is available */
+#undef HAVE_GMP
 
 /* Define to 1 if you have the <inttypes.h> header file. */

ThirdParty/Glpk/branches/autotools-update/configure

@@ -781 +781 @@
 with_sysroot
 enable_libtool_lock
+enable_gmp
 enable_odbc
 enable_mysql
@@ -1425 +1426 @@
                           speeds up one-time build
   --disable-libtool-lock  avoid locking (might break parallel builds)
+  --disable-gmp           do not compile with GNU multiple precision library
   --enable-odbc           enable MathProg ODBC support [[default=auto]]
   --enable-mysql          enable MathProg MySQL support [[default=auto]]
@@ -12384 +12386 @@
 
 
-#AC_COIN_CHECK_GMP(Glpk)
-#if test $coin_has_gmp = yes; then
-#  AC_DEFINE([HAVE_GMP],[1],[Define to 1 if GMP is available])
-#fi
+
+
+# Check whether --enable-gmp was given.
+if test "${enable_gmp+set}" = set; then :
+  enableval=$enable_gmp; coin_enable_gmp=$enableval
+else
+  coin_enable_gmp=yes
+fi
+
+
+coin_has_gmp=no
+if test $coin_enable_gmp = yes; then
+  ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+  ac_fn_c_check_header_mongrel "$LINENO" "gmp.h" "ac_cv_header_gmp_h" "$ac_includes_default"
+if test "x$ac_cv_header_gmp_h" = xyes; then :
+  { $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 ${ac_cv_lib_gmp___gmpz_init+:} false; 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_c_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" = xyes; then :
+  coin_has_gmp=yes
+fi
+
+fi
+
+
+
+  if test $coin_has_gmp = yes ; then
+    GLPK_LIBS="-lgmp $GLPK_LIBS"
+
+$as_echo "#define COIN_HAS_GMP 1" >>confdefs.h
+
+  fi
+  ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+fi
+
+if test $coin_has_gmp = yes; then
+
+$as_echo "#define HAVE_GMP 1" >>confdefs.h
+
+fi
 
 ac_fn_c_check_func "$LINENO" "vsnprintf" "ac_cv_func_vsnprintf"
@@ -12402 +12483 @@
 
 
-#AC_COIN_CHECK_LIBM(Glpk)
+#Does Glpk needs -lm? AC_COIN_CHECK_LIBM(Glpk)
 
 ###########################################################################

ThirdParty/Glpk/branches/autotools-update/configure.ac

@@ -51 +51 @@
 AC_LANG_PUSH(C)
 
-#AC_COIN_CHECK_GMP(Glpk)
-#if test $coin_has_gmp = yes; then
-#  AC_DEFINE([HAVE_GMP],[1],[Define to 1 if GMP is available])
-#fi
+AC_COIN_CHECK_GMP(Glpk)
+if test $coin_has_gmp = yes; then
+  AC_DEFINE([HAVE_GMP],[1],[Define to 1 if GMP is available])
+fi
 
 AC_CHECK_FUNC([vsnprintf])
@@ -60 +60 @@
 AC_LANG_POP(C)
 
-#AC_COIN_CHECK_LIBM(Glpk)
+#Does Glpk needs -lm? AC_COIN_CHECK_LIBM(Glpk)
 
 ###########################################################################