Changeset 888b457 in git


Ignore:
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:
4 edited

Legend:

Unmodified
Added
Removed
  • dyn_modules/callgfanlib/gfan.cc

    rebc74a2 r888b457  
    3232#endif
    3333
     34#ifdef HAVE_CDD_SETOPER_H
     35#include <cdd/setoper.h>
     36#include <cdd/cdd.h>
     37#include <cdd/cddmp.h>
     38#else
    3439#include <setoper.h>
    3540#include <cdd.h>
    3641#include <cddmp.h>
     42#endif
    3743
    3844#ifndef gfan_DEBUG
  • dyn_modules/callgfanlib/gfan.h

    rebc74a2 r888b457  
    99#include <libpolys/misc/int64vec.h>
    1010
     11#include <gfanlib/config.h>
     12#ifdef HAVE_CDD_SETOPER_H
     13#include <cdd/setoper.h>
     14#include <cdd/cdd.h>
     15#include <cdd/cddmp.h>
     16#else
    1117#include <setoper.h>
    1218#include <cdd.h>
    1319#include <cddmp.h>
     20#endif
    1421#include <bbfan.h>
    1522#include <bbcone.h>
  • gfanlib/configure.ac

    rebc74a2 r888b457  
    3535#       exit 1
    3636# fi
    37 AC_CHECK_HEADERS([setoper.h])
    38 if test "$ac_cv_header_setoper_h" == no
     37AC_CHECK_HEADERS([cdd/setoper.h setoper.h])
     38if test "$ac_cv_header_setoper_h" == no -a "$ac_cv_header_cdd_setoper_h" == no
    3939then
    4040        AC_MSG_WARN([Error, setoper.h is missing!])
    4141fi
    4242
    43 AC_CHECK_HEADERS([cdd.h],,,
    44 [
    45 # include <setoper.h>
    46 ])
     43# if setoper.h is there, assume that also cdd.h is there
     44#AC_CHECK_HEADERS([cdd/cdd.h cdd.h],,,
     45#[
     46## include <setoper.h>
     47#])
    4748
    48 if test "$ac_cv_header_cdd_h" == no
     49if test "$ac_cv_header_cdd_h" == no -a "$ac_cv_header_cdd_cdd_h" == no
    4950then
    5051        AC_MSG_WARN([Error, cdd.h is missing!])
     
    5253
    5354if test "x$ENABLE_GFANLIB" = xyes; then
    54 if test "$ac_cv_header_setoper_h" == no
     55if test "$ac_cv_header_setoper_h" == no -a "$ac_cv_header_cdd_setoper_h" == no
    5556then
    5657        exit 1
    5758fi
    58 if test "$ac_cv_header_cdd_h" == no
     59if test "$ac_cv_header_cdd_h" == no -a "$ac_cv_header_cdd_cdd_h" == no
    5960then
    6061        exit 1
     
    8283
    8384AC_CONFIG_FILES([Makefile])
     85AC_CONFIG_HEADERS([config.h])
    8486AC_OUTPUT
  • gfanlib/gfanlib_zcone.cpp

    rebc74a2 r888b457  
    1111#include <set>
    1212
     13#include "config.h"
     14#ifdef HAVE_CDD_SETOPER_H
     15#include "cdd/setoper.h"
     16#include "cdd/cdd.h"
     17#else
    1318#include "setoper.h"
    1419#include "cdd.h"
     20#endif
    1521
    1622namespace gfan{
Note: See TracChangeset for help on using the changeset viewer.