From 52bddef96e7536db2d398f34be889cc2c6bcc499 Mon Sep 17 00:00:00 2001
From: Christophe Geuzaine <cgeuzaine@ulg.ac.be>
Date: Mon, 30 Mar 2009 17:42:53 +0000
Subject: [PATCH] make sure we have gmp before using kbipack

---
 Common/GmshConfig.h.in |  1 +
 Geo/CellComplex.cpp    |  4 +++
 Geo/CellComplex.h      |  5 ++-
 configure              | 75 ++++++++++++++++++++++++++++++++++++++----
 configure.in           | 15 +++++----
 5 files changed, 86 insertions(+), 14 deletions(-)

diff --git a/Common/GmshConfig.h.in b/Common/GmshConfig.h.in
index 3b5ad15d47..a5d73b4033 100644
--- a/Common/GmshConfig.h.in
+++ b/Common/GmshConfig.h.in
@@ -13,6 +13,7 @@
 #undef HAVE_FLTK
 #undef HAVE_FOURIER_MODEL
 #undef HAVE_GMM
+#undef HAVE_KBIPACK
 #undef HAVE_LAPACK
 #undef HAVE_LIBCGNS
 #undef HAVE_LIBJPEG
diff --git a/Geo/CellComplex.cpp b/Geo/CellComplex.cpp
index 7b117e1cef..25b8cb1285 100644
--- a/Geo/CellComplex.cpp
+++ b/Geo/CellComplex.cpp
@@ -7,6 +7,8 @@
 
 #include "CellComplex.h"
 
+#if defined(HAVE_KBIPACK)
+
 CellComplex::CellComplex( std::vector<GEntity*> domain, std::vector<GEntity*> subdomain ){
   
   _domain = domain;
@@ -518,3 +520,5 @@ void CellComplex::printComplex(int dim){
     printf("\n");
   }
 }
+
+#endif
diff --git a/Geo/CellComplex.h b/Geo/CellComplex.h
index 55aa4bf4f0..dbcbd202f0 100644
--- a/Geo/CellComplex.h
+++ b/Geo/CellComplex.h
@@ -19,6 +19,9 @@
 #include "GRegion.h"
 #include "GFace.h"
 #include "GVertex.h"
+
+#if defined(HAVE_KBIPACK)
+
 #include "gmp.h"
 extern "C" {
   #include "gmp_normal_form.h" // perhaps make c++ headers instead?
@@ -414,6 +417,6 @@ class CellComplex
    
 };
 
-
+#endif
 
 #endif
diff --git a/configure b/configure
index 2eefd1d2e1..4e6eb6ef79 100755
--- a/configure
+++ b/configure
@@ -4754,7 +4754,67 @@ _ACEOF
   fi
 
     if test "x$enable_kbipack" != "xno"; then
-    { echo "$as_me:$LINENO: checking for ./contrib/kbipack/gmp_normal_form.h" >&5
+    { echo "$as_me:$LINENO: checking for main in -lgmp" >&5
+echo $ECHO_N "checking for main in -lgmp... $ECHO_C" >&6; }
+if test "${ac_cv_lib_gmp_main+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-lgmp  $LIBS"
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+
+
+int
+main ()
+{
+return main ();
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_link") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_cxx_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
+  ac_cv_lib_gmp_main=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	ac_cv_lib_gmp_main=no
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+      conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ echo "$as_me:$LINENO: result: $ac_cv_lib_gmp_main" >&5
+echo "${ECHO_T}$ac_cv_lib_gmp_main" >&6; }
+if test $ac_cv_lib_gmp_main = yes; then
+  GMP="yes"
+fi
+
+    if test "x${GMP}" = "xyes"; then
+      { echo "$as_me:$LINENO: checking for ./contrib/kbipack/gmp_normal_form.h" >&5
 echo $ECHO_N "checking for ./contrib/kbipack/gmp_normal_form.h... $ECHO_C" >&6; }
 if test "${ac_cv_file___contrib_kbipack_gmp_normal_form_h+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -4775,14 +4835,15 @@ if test $ac_cv_file___contrib_kbipack_gmp_normal_form_h = yes; then
   KBIPACK="yes"
 fi
 
-    if test "x${KBIPACK}" = "xyes"; then
-      GMSH_DIRS="${GMSH_DIRS} contrib/kbipack"
-      GMSH_LIBS="${GMSH_LIBS} -lGmshKbi -lgmp"
-      cat >>confdefs.h <<\_ACEOF
-#define HAVE_kbipack 1
+      if test "x${KBIPACK}" = "xyes"; then
+        GMSH_DIRS="${GMSH_DIRS} contrib/kbipack"
+        GMSH_LIBS="${GMSH_LIBS} -lGmshKbi -lgmp"
+        cat >>confdefs.h <<\_ACEOF
+#define HAVE_KBIPACK 1
 _ACEOF
 
-      BO="${BO} kbipack"
+        BO="${BO} Kbipack"
+      fi
     fi
   fi
 
diff --git a/configure.in b/configure.in
index e253c4745d..63bc6c200f 100644
--- a/configure.in
+++ b/configure.in
@@ -507,12 +507,15 @@ if test "x$enable_contrib" != "xno"; then
   
   dnl Check for kbipack
   if test "x$enable_kbipack" != "xno"; then
-    AC_CHECK_FILE(./contrib/kbipack/gmp_normal_form.h,KBIPACK="yes")
-    if test "x${KBIPACK}" = "xyes"; then
-      GMSH_DIRS="${GMSH_DIRS} contrib/kbipack"
-      GMSH_LIBS="${GMSH_LIBS} -lGmshKbi -lgmp"
-      AC_DEFINE(HAVE_kbipack)
-      BO="${BO} kbipack"
+    AC_CHECK_LIB(gmp,main,GMP="yes")
+    if test "x${GMP}" = "xyes"; then
+      AC_CHECK_FILE(./contrib/kbipack/gmp_normal_form.h,KBIPACK="yes")
+      if test "x${KBIPACK}" = "xyes"; then
+        GMSH_DIRS="${GMSH_DIRS} contrib/kbipack"
+        GMSH_LIBS="${GMSH_LIBS} -lGmshKbi -lgmp"
+        AC_DEFINE(HAVE_KBIPACK)
+        BO="${BO} Kbipack"
+      fi
     fi
   fi
 
-- 
GitLab