Changeset 24aeb0f in git


Ignore:
Timestamp:
Oct 26, 2013, 3:13:30 PM (11 years ago)
Author:
Hans Schoenemann <hannes@…>
Branches:
(u'fieker-DuVal', '117eb8c30fc9e991c4decca4832b1d19036c4c65')(u'spielwiese', '4188d308699580d975efd0f6cca8dcb41c396f70')
Children:
6aee8f3596288969a7c2be2063263a666f4fbe08
Parents:
a867b2ad8475230ee7943dfc47b1565ab179aca4
Message:
fix: cddlib detection for fedora
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • dyn_modules/callgfanlib/gfan.h

    ra867b2 r24aeb0f  
    1414#include <cdd/cdd.h>
    1515#include <cdd/cddmp.h>
     16#elif HAVE_CDDLIB_SETOPER_H
     17#include <cddlib/setoper.h>
     18#include <cddlib/cdd.h>
     19#include <cddlib/cddmp.h>
    1620#else
    1721#include <setoper.h>
  • gfanlib/configure.ac

    ra867b2 r24aeb0f  
    4646
    4747# if setoper.h is there, assume that also cdd.h is there
    48 #AC_CHECK_HEADERS([cdd/cdd.h cdd.h],,,
    49 #[
    50 ## include <setoper.h>
    51 #])
    52 
    53 if test "$ac_cv_header_cdd_h" == no -a "$ac_cv_header_cdd_cdd_h" == no
    54 then
    55         AC_MSG_WARN([Error, cdd.h is missing!])
    56 fi
    5748
    5849if test "x$ENABLE_GFANLIB" = xyes; then
    5950if test "$ac_cv_header_setoper_h" == no -a "$ac_cv_header_cdd_setoper_h" == no -a "$ac_cv_header_cddlib_setoper_h" == no
    60 then
    61         exit 1
    62 fi
    63 if test "$ac_cv_header_cdd_h" == no -a "$ac_cv_header_cdd_cdd_h" == no
    6451then
    6552        exit 1
  • gfanlib/gfanlib_zcone.cpp

    ra867b2 r24aeb0f  
    1717#include "cdd/setoper.h"
    1818#include "cdd/cdd.h"
     19#elif HAVE_CDDLIB_SETOPER_H
     20#include "cddlib/setoper.h"
     21#include "cddlib/cdd.h"
    1922#else
    2023#include "setoper.h"
  • m4/gfanlib-check.m4

    ra867b2 r24aeb0f  
    3333  [PASSED_ALL_TESTS_FOR_GFANLIB="yes"],
    3434  [AC_MSG_WARN([libcddgmp is not installed.])]
    35   [PASSED_ALL_TESTS_FOR_GFANLIB="no";
    36   exit 1]
     35  [PASSED_ALL_TESTS_FOR_GFANLIB="no"
     36  ]
     37)
     38fi
     39if test "$PASSED_ALL_TESTS_FOR_GFANLIB" != yes; then
     40AC_LINK_IFELSE(
     41  [AC_LANG_PROGRAM([#include <cddlib/setoper.h>
     42  #include "cddlib/cdd.h"],
     43    [dd_set_global_constants()])],
     44  [LIBS="$SAVE_LIBS -lcddgmp"] [CDDGMPLDFLAGS="-lcddgmp"]
     45  [PASSED_ALL_TESTS_FOR_GFANLIB="yes"],
     46  [AC_MSG_WARN([libcddgmp is not installed.])]
     47  [PASSED_ALL_TESTS_FOR_GFANLIB="no"
     48  ]
    3749)
    3850fi
Note: See TracChangeset for help on using the changeset viewer.