Changeset 24aeb0f in git

Timestamp:

Oct 26, 2013, 3:13:30 PM (9 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'jengelh-datetime', 'ceac47cbc86fe4a15902392bdbb9bd2ae0ea02c6')(u'spielwiese', 'a800fe4b3e9d37a38c5a10cc0ae9dfa0c15a4ee6')

Children:

6aee8f3596288969a7c2be2063263a666f4fbe08

Parents:

a867b2ad8475230ee7943dfc47b1565ab179aca4

Message:

fix: cddlib detection for fedora

Files:

• dyn_modules/callgfanlib/gfan.h (modified) (1 diff)
• gfanlib/configure.ac (modified) (1 diff)
• gfanlib/gfanlib_zcone.cpp (modified) (1 diff)
• m4/gfanlib-check.m4 (modified) (1 diff)

dyn_modules/callgfanlib/gfan.h

@@ -14 +14 @@
 #include <cdd/cdd.h>
 #include <cdd/cddmp.h>
+#elif HAVE_CDDLIB_SETOPER_H
+#include <cddlib/setoper.h>
+#include <cddlib/cdd.h>
+#include <cddlib/cddmp.h>
 #else
 #include <setoper.h>

gfanlib/configure.ac

@@ -46 +46 @@
 
 # if setoper.h is there, assume that also cdd.h is there
-#AC_CHECK_HEADERS([cdd/cdd.h cdd.h],,,
-#[
-## include <setoper.h>
-#])
-
-if test "$ac_cv_header_cdd_h" == no -a "$ac_cv_header_cdd_cdd_h" == no
-then
-        AC_MSG_WARN([Error, cdd.h is missing!])
-fi
 
 if test "x$ENABLE_GFANLIB" = xyes; then
 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
-        exit 1
-fi
-if test "$ac_cv_header_cdd_h" == no -a "$ac_cv_header_cdd_cdd_h" == no
 then
         exit 1

gfanlib/gfanlib_zcone.cpp

@@ -17 +17 @@
 #include "cdd/setoper.h"
 #include "cdd/cdd.h"
+#elif HAVE_CDDLIB_SETOPER_H
+#include "cddlib/setoper.h"
+#include "cddlib/cdd.h"
 #else
 #include "setoper.h"

m4/gfanlib-check.m4

@@ -33 +33 @@
   [PASSED_ALL_TESTS_FOR_GFANLIB="yes"],
   [AC_MSG_WARN([libcddgmp is not installed.])] 
-  [PASSED_ALL_TESTS_FOR_GFANLIB="no";
-  exit 1]
+  [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