Changeset 24aeb0f in git for gfanlib

Timestamp:

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

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'fieker-DuVal', '117eb8c30fc9e991c4decca4832b1d19036c4c65')(u'spielwiese', 'c5facdfddea2addfd91babd8b9019161dea4b695')

Children:

6aee8f3596288969a7c2be2063263a666f4fbe08

Parents:

a867b2ad8475230ee7943dfc47b1565ab179aca4

Message:

fix: cddlib detection for fedora

Location:

gfanlib

Files:

• configure.ac (modified) (1 diff)
• gfanlib_zcone.cpp (modified) (1 diff)

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"