- Timestamp:
- Apr 23, 2013, 1:21:12 PM (11 years ago)
- Branches:
- (u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')
- Children:
- b56249a26a4a4c196f337af607b16766d14d2821
- Parents:
- ebc74a292ebc8a867db62c32c3f68fda997029a7
- Location:
- gfanlib
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
gfanlib/configure.ac
rebc74a2 r888b457 35 35 # exit 1 36 36 # fi 37 AC_CHECK_HEADERS([ setoper.h])38 if test "$ac_cv_header_setoper_h" == no 37 AC_CHECK_HEADERS([cdd/setoper.h setoper.h]) 38 if test "$ac_cv_header_setoper_h" == no -a "$ac_cv_header_cdd_setoper_h" == no 39 39 then 40 40 AC_MSG_WARN([Error, setoper.h is missing!]) 41 41 fi 42 42 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 #]) 47 48 48 if test "$ac_cv_header_cdd_h" == no 49 if test "$ac_cv_header_cdd_h" == no -a "$ac_cv_header_cdd_cdd_h" == no 49 50 then 50 51 AC_MSG_WARN([Error, cdd.h is missing!]) … … 52 53 53 54 if test "x$ENABLE_GFANLIB" = xyes; then 54 if test "$ac_cv_header_setoper_h" == no 55 if test "$ac_cv_header_setoper_h" == no -a "$ac_cv_header_cdd_setoper_h" == no 55 56 then 56 57 exit 1 57 58 fi 58 if test "$ac_cv_header_cdd_h" == no 59 if test "$ac_cv_header_cdd_h" == no -a "$ac_cv_header_cdd_cdd_h" == no 59 60 then 60 61 exit 1 … … 82 83 83 84 AC_CONFIG_FILES([Makefile]) 85 AC_CONFIG_HEADERS([config.h]) 84 86 AC_OUTPUT -
gfanlib/gfanlib_zcone.cpp
rebc74a2 r888b457 11 11 #include <set> 12 12 13 #include "config.h" 14 #ifdef HAVE_CDD_SETOPER_H 15 #include "cdd/setoper.h" 16 #include "cdd/cdd.h" 17 #else 13 18 #include "setoper.h" 14 19 #include "cdd.h" 20 #endif 15 21 16 22 namespace gfan{
Note: See TracChangeset
for help on using the changeset viewer.