Changeset bbeddf in git for m4/gfanlib-check.m4

Timestamp:

Nov 15, 2013, 5:13:23 PM (10 years ago)

Author:

Oleksandr Motsak <motsak@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

989d6be2dba06d1abec8f5c86bd77f2a001e1e4d

Parents:

1684c331ce908bffa043d3afe97c0a2c4b181d99

git-author:

Oleksandr Motsak <motsak@mathematik.uni-kl.de>2013-11-15 17:13:23+01:00

git-committer:

Oleksandr Motsak <motsak@mathematik.uni-kl.de>2013-11-15 17:17:40+01:00

Message:

Fixed BS: gfanlib/cddlib checking/building/embedding

fix: cddlib configure checks
add: static building-in
fix: return code for _mod_init functions

File:

• m4/gfanlib-check.m4 (modified) (1 diff)

m4/gfanlib-check.m4

@@ -9 +9 @@
 [ENABLE_GFANLIB="no"])
 
-BACKUP_LIBS=$LIBS
+AC_MSG_CHECKING(whether to build with gfanlib)
 
-AC_MSG_CHECKING(whether to build with gfanlib)
 if test "x$ENABLE_GFANLIB" = xyes; then
  AC_MSG_RESULT(yes)
+
+ AC_CHECK_HEADERS([setoper.h cdd/setoper.h cddlib/setoper.h])
+
+ if test "$ac_cv_header_setoper_h" == no -a "$ac_cv_header_cdd_setoper_h" == no -a "$ac_cv_header_cddlib_setoper_h" == no
+ then
+        AC_MSG_WARN([Error, setoper.h is missing!]) 
+ fi
+
+ AC_MSG_CHECKING([whether libcddgmp is usable])
+
+ BACKUP_LIBS=$LIBS
+
+ LIBS="-lcddgmp $GMP_LIBS $LIBS"
+
  AC_LANG_PUSH(C++)
- SAVE_LIBS=$LIBS
- LIBS="-lcddgmp $GMP_LIBS $LIBS"
-AC_LINK_IFELSE(
-  [AC_LANG_PROGRAM([#include <cdd/setoper.h>
-  #include <cdd/cdd.h>],
-    [dd_set_global_constants()])],
-  [LIBS="-lcddgmp $SAVE_LIBS"] [CDDGMPLDFLAGS="-lcddgmp"] 
-  [PASSED_ALL_TESTS_FOR_GFANLIB="yes"],
-  [AC_MSG_WARN([libcddgmp is not installed.])] 
-  [PASSED_ALL_TESTS_FOR_GFANLIB="no"
-  ]
-)
-if test "$PASSED_ALL_TESTS_FOR_GFANLIB" != yes; then
-AC_LINK_IFELSE(
-  [AC_LANG_PROGRAM([#include <setoper.h>
-  #include "cdd.h"],
-    [dd_set_global_constants()])],
-  [LIBS="$SAVE_LIBS -lcddgmp"] [CDDGMPLDFLAGS="-lcddgmp"] 
-  [PASSED_ALL_TESTS_FOR_GFANLIB="yes"],
-  [AC_MSG_WARN([libcddgmp is not installed.])] 
-  [PASSED_ALL_TESTS_FOR_GFANLIB="no"
-  ]
-)
-fi
-if test "$PASSED_ALL_TESTS_FOR_GFANLIB" != yes; then
-AC_LINK_IFELSE(
-  [AC_LANG_PROGRAM([#include <cddlib/setoper.h>
-  #include "cddlib/cdd.h"],
-    [dd_set_global_constants()])],
-  [LIBS="$SAVE_LIBS -lcddgmp"] [CDDGMPLDFLAGS="-lcddgmp"] 
-  [PASSED_ALL_TESTS_FOR_GFANLIB="yes"],
-  [AC_MSG_WARN([libcddgmp is not installed.])] 
-  [PASSED_ALL_TESTS_FOR_GFANLIB="no"
-  ]
-)
-fi
-  AC_LANG_POP()
+ AC_LINK_IFELSE(
+  [
+   AC_LANG_PROGRAM(
+    [
+     #ifdef HAVE_SETOPER_H
+     # include <setoper.h>
+     # include <cdd.h>
+     #endif
+     #ifdef HAVE_CDD_SETOPER_H
+     # include <cdd/setoper.h>
+     # include <cdd/cdd.h>
+     #endif
+     #ifdef HAVE_CDDLIB_SETOPER_H
+     # include <cddlib/setoper.h>
+     # include <cddlib/cdd.h>
+     #endif
+    ], [dd_set_global_constants()]    )
+  ],
+  [PASSED_ALL_TESTS_FOR_GFANLIB="1"] [CDDGMPLDFLAGS="-lcddgmp"],
+  [PASSED_ALL_TESTS_FOR_GFANLIB="0"]
+ )
+ AC_LANG_POP()
+
+ LIBS=$BACKUP_LIBS
+
+ AC_MSG_RESULT(no)
+
+ AC_SUBST(CDDGMPLDFLAGS) 
 else
  AC_MSG_RESULT(no)
- PASSED_ALL_TESTS_FOR_GFANLIB="no";
+ PASSED_ALL_TESTS_FOR_GFANLIB="0"
 fi
 
-LIBS=$BACKUP_LIBS
 
-AM_CONDITIONAL(HAVE_GFANLIB, test "x$PASSED_ALL_TESTS_FOR_GFANLIB" = xyes)
+AM_CONDITIONAL(HAVE_GFANLIB, test "x$PASSED_ALL_TESTS_FOR_GFANLIB" = x1)
+AC_DEFINE_UNQUOTED(HAVE_GFANLIB, ${PASSED_ALL_TESTS_FOR_GFANLIB}, [whether gfanlib support is enabled])
 
 ])