Changeset 888b457 in git

Timestamp:

Apr 23, 2013, 1:21:12 PM (9 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'jengelh-datetime', 'ceac47cbc86fe4a15902392bdbb9bd2ae0ea02c6')(u'spielwiese', '5bec8f88c9ee2573d328cf7c3aff2bcb301d2395')

Children:

b56249a26a4a4c196f337af607b16766d14d2821

Parents:

ebc74a292ebc8a867db62c32c3f68fda997029a7

Message:

fix: adapt to different locations for cdd includes

from master

Files:

• dyn_modules/callgfanlib/gfan.cc (modified) (1 diff)
• dyn_modules/callgfanlib/gfan.h (modified) (1 diff)
• gfanlib/configure.ac (modified) (3 diffs)
• gfanlib/gfanlib_zcone.cpp (modified) (1 diff)

dyn_modules/callgfanlib/gfan.cc

@@ -32 +32 @@
 #endif
 
+#ifdef HAVE_CDD_SETOPER_H
+#include <cdd/setoper.h>
+#include <cdd/cdd.h>
+#include <cdd/cddmp.h>
+#else
 #include <setoper.h>
 #include <cdd.h>
 #include <cddmp.h>
+#endif
 
 #ifndef gfan_DEBUG

dyn_modules/callgfanlib/gfan.h

@@ -9 +9 @@
 #include <libpolys/misc/int64vec.h>
 
+#include <gfanlib/config.h>
+#ifdef HAVE_CDD_SETOPER_H
+#include <cdd/setoper.h>
+#include <cdd/cdd.h>
+#include <cdd/cddmp.h>
+#else
 #include <setoper.h>
 #include <cdd.h>
 #include <cddmp.h>
+#endif
 #include <bbfan.h>
 #include <bbcone.h>

gfanlib/configure.ac

@@ -35 +35 @@
 #       exit 1
 # fi
-AC_CHECK_HEADERS([setoper.h])
-if test "$ac_cv_header_setoper_h" == no 
+AC_CHECK_HEADERS([cdd/setoper.h setoper.h])
+if test "$ac_cv_header_setoper_h" == no -a "$ac_cv_header_cdd_setoper_h" == no
 then
         AC_MSG_WARN([Error, setoper.h is missing!])
 fi
 
-AC_CHECK_HEADERS([cdd.h],,,
-[
-# include <setoper.h>
-])
+# 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
+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!])
@@ -52 +53 @@
 
 if test "x$ENABLE_GFANLIB" = xyes; then
-if test "$ac_cv_header_setoper_h" == no 
+if test "$ac_cv_header_setoper_h" == no -a "$ac_cv_header_cdd_setoper_h" == no
 then
         exit 1
 fi
-if test "$ac_cv_header_cdd_h" == no
+if test "$ac_cv_header_cdd_h" == no -a "$ac_cv_header_cdd_cdd_h" == no
 then
         exit 1
@@ -82 +83 @@
 
 AC_CONFIG_FILES([Makefile])
+AC_CONFIG_HEADERS([config.h])
 AC_OUTPUT

gfanlib/gfanlib_zcone.cpp

@@ -11 +11 @@
 #include <set>
 
+#include "config.h"
+#ifdef HAVE_CDD_SETOPER_H
+#include "cdd/setoper.h"
+#include "cdd/cdd.h"
+#else
 #include "setoper.h"
 #include "cdd.h"
+#endif
 
 namespace gfan{