Changeset 1542


Ignore:
Timestamp:
Apr 24, 2010 12:32:46 PM (10 years ago)
Author:
stefan
Message:

use new fallback macro, do not use COIN_HAS_PROJECT anymore; complain if CoinUtils? is not available

Location:
branches/split/Clp
Files:
8 edited

Legend:

Unmodified
Added
Removed
  • branches/split/Clp/Makefile.in

    r1530 r1542  
    136136CDEFS = @CDEFS@
    137137CFLAGS = @CFLAGS@
    138 COINUTILSDOCDIR = @COINUTILSDOCDIR@
    139 COINUTILSOBJDIR = @COINUTILSOBJDIR@
    140 COINUTILSSRCDIR = @COINUTILSSRCDIR@
    141138COINUTILS_CFLAGS = @COINUTILS_CFLAGS@
    142139COINUTILS_DATA = @COINUTILS_DATA@
     
    200197OPT_CFLAGS = @OPT_CFLAGS@
    201198OPT_CXXFLAGS = @OPT_CXXFLAGS@
    202 OSIDOCDIR = @OSIDOCDIR@
    203 OSIOBJDIR = @OSIOBJDIR@
    204 OSISRCDIR = @OSISRCDIR@
    205199OSITESTS_CFLAGS = @OSITESTS_CFLAGS@
    206200OSITESTS_DATA = @OSITESTS_DATA@
  • branches/split/Clp/clp-uninstalled.pc.in

    r1522 r1542  
    11prefix=@prefix@
    22libdir=@ABSBUILDDIR@/src
    3 includedir=@abs_source_dir@/src
    43
    54Name: CLP
     
    76Version: @PACKAGE_VERSION@
    87Libs: -L${libdir} -lClp @ADDLIBS@
    9 Cflags: -I${includedir} -I@ABSBUILDDIR@/inc
     8Cflags: -I@abs_source_dir@/src -I@ABSBUILDDIR@/inc
    109Requires: @REQUIREDPACKAGES@
  • branches/split/Clp/configure

    r1530 r1542  
    473473#endif"
    474474
    475 ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os ADDLIBS FADDLIBS ALWAYS_FALSE_TRUE ALWAYS_FALSE_FALSE CDEFS ADD_CFLAGS DBG_CFLAGS OPT_CFLAGS sol_cc_compiler CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT MPICC CXXDEFS ADD_CXXFLAGS DBG_CXXFLAGS OPT_CXXFLAGS CXX CXXFLAGS ac_ct_CXX MPICXX EGREP INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT LIBTOOLM4 have_autoconf have_automake have_svn BUILDTOOLSDIR AUX_DIR abs_source_dir abs_lib_dir abs_include_dir abs_bin_dir HAVE_EXTERNALS_TRUE HAVE_EXTERNALS_FALSE host host_cpu host_vendor host_os LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CPP CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL ac_c_preproc_warn_flag ac_cxx_preproc_warn_flag RPATH_FLAGS LT_LDFLAGS PKG_CONFIG ac_pt_PKG_CONFIG COINUTILS_LIBS COINUTILS_CFLAGS COINUTILS_DATA REQUIREDPACKAGES COIN_HAS_COINUTILS_TRUE COIN_HAS_COINUTILS_FALSE OSI_LIBS OSI_CFLAGS OSI_DATA COIN_HAS_OSI_TRUE COIN_HAS_OSI_FALSE OSITESTS_LIBS OSITESTS_CFLAGS OSITESTS_DATA COIN_HAS_OSITESTS_TRUE COIN_HAS_OSITESTS_FALSE SAMPLE_LIBS SAMPLE_CFLAGS SAMPLE_DATA COIN_HAS_SAMPLE_TRUE COIN_HAS_SAMPLE_FALSE NETLIB_LIBS NETLIB_CFLAGS NETLIB_DATA COIN_HAS_NETLIB_TRUE COIN_HAS_NETLIB_FALSE COINUTILSSRCDIR COINUTILSOBJDIR COINUTILSDOCDIR OSISRCDIR OSIOBJDIR OSIDOCDIR LIBEXT VPATH_DISTCLEANFILES ABSBUILDDIR LIBOBJS LTLIBOBJS'
     475ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os ADDLIBS FADDLIBS ALWAYS_FALSE_TRUE ALWAYS_FALSE_FALSE CDEFS ADD_CFLAGS DBG_CFLAGS OPT_CFLAGS sol_cc_compiler CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT MPICC CXXDEFS ADD_CXXFLAGS DBG_CXXFLAGS OPT_CXXFLAGS CXX CXXFLAGS ac_ct_CXX MPICXX EGREP INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT LIBTOOLM4 have_autoconf have_automake have_svn BUILDTOOLSDIR AUX_DIR abs_source_dir abs_lib_dir abs_include_dir abs_bin_dir HAVE_EXTERNALS_TRUE HAVE_EXTERNALS_FALSE host host_cpu host_vendor host_os LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CPP CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL ac_c_preproc_warn_flag ac_cxx_preproc_warn_flag RPATH_FLAGS LT_LDFLAGS PKG_CONFIG ac_pt_PKG_CONFIG COINUTILS_LIBS COINUTILS_CFLAGS COINUTILS_DATA REQUIREDPACKAGES COIN_HAS_COINUTILS_TRUE COIN_HAS_COINUTILS_FALSE OSI_LIBS OSI_CFLAGS OSI_DATA COIN_HAS_OSI_TRUE COIN_HAS_OSI_FALSE OSITESTS_LIBS OSITESTS_CFLAGS OSITESTS_DATA COIN_HAS_OSITESTS_TRUE COIN_HAS_OSITESTS_FALSE SAMPLE_LIBS SAMPLE_CFLAGS SAMPLE_DATA COIN_HAS_SAMPLE_TRUE COIN_HAS_SAMPLE_FALSE NETLIB_LIBS NETLIB_CFLAGS NETLIB_DATA COIN_HAS_NETLIB_TRUE COIN_HAS_NETLIB_FALSE LIBEXT VPATH_DISTCLEANFILES ABSBUILDDIR LIBOBJS LTLIBOBJS'
    476476ac_subst_files=''
    477477
     
    2043320433
    2043420434#############################################################################
    20435 #                              COIN components                              #
     20435#                              COIN-OR components                           #
    2043620436#############################################################################
    2043720437
     
    2056020560
    2056120561
    20562 echo "$as_me:$LINENO: checking for COIN module CoinUtils" >&5
    20563 echo $ECHO_N "checking for COIN module CoinUtils... $ECHO_C" >&6
     20562echo "$as_me:$LINENO: checking for COIN-OR module CoinUtils" >&5
     20563echo $ECHO_N "checking for COIN-OR module CoinUtils... $ECHO_C" >&6
    2056420564
    2056520565coin_has_coinutils=notGiven
     
    2058220582
    2058320583
    20584 required=1
    20585 
    20586 # execute third argument that can be used to overwrite flags like 'required'
    20587 
    20588 
    2058920584#check if user provided LIBS, CFLAGS, and DATA for module
    2059020585if test $coin_has_coinutils != skipping; then
     
    2059620591  coin_has_coinutils=yes
    2059720592       COINUTILS_LIBS="$withval"
    20598        if test $required = 1; then
    20599          ADDLIBS="$ADDLIBS $withval"
    20600        fi
     20593       ADDLIBS="$ADDLIBS $withval"
    2060120594
    2060220595fi;
     
    2068320676        echo "$as_me:$LINENO: result: yes: $COINUTILS_VERSIONS" >&5
    2068420677echo "${ECHO_T}yes: $COINUTILS_VERSIONS" >&6
    20685         if test $required = 1; then
    20686           REQUIREDPACKAGES="$REQUIREDPACKAGES coinutils = split"
    20687         fi
     20678        REQUIREDPACKAGES="$REQUIREDPACKAGES coinutils = split"
    2068820679
    2068920680
     
    2071720708if test $coin_has_coinutils != skipping &&
    2071820709   test $coin_has_coinutils != notGiven ; then
     20710  if test 0 = 1 ; then  #change this test to enable a bit of debugging output
    2071920711  if test -n "$COINUTILS_CFLAGS" ; then
    2072020712    { echo "$as_me:$LINENO: CoinUtils CFLAGS are $COINUTILS_CFLAGS" >&5
     
    2072820720    { echo "$as_me:$LINENO: CoinUtils DATA   is  $COINUTILS_DATA" >&5
    2072920721echo "$as_me: CoinUtils DATA   is  $COINUTILS_DATA" >&6;}
     20722  fi
    2073020723  fi
    2073120724
     
    2075120744
    2075220745
    20753 echo "$as_me:$LINENO: checking for COIN module Osi" >&5
    20754 echo $ECHO_N "checking for COIN module Osi... $ECHO_C" >&6
     20746if test $coin_has_coinutils != "yes" ; then
     20747echo "$as_me:$LINENO: checking for COIN-OR module CoinUtils (fallback)" >&5
     20748echo $ECHO_N "checking for COIN-OR module CoinUtils (fallback)... $ECHO_C" >&6
     20749
     20750coin_has_coinutils=notGiven
     20751
     20752# check if user wants to skip module in any case
     20753if test x"$COIN_SKIP_PROJECTS" != x; then
     20754  for dir in $COIN_SKIP_PROJECTS; do
     20755    if test $dir = "CoinUtils"; then
     20756      coin_has_coinutils=skipping
     20757    fi
     20758  done
     20759fi
     20760
     20761COINUTILS_LIBS=
     20762COINUTILS_CFLAGS=
     20763COINUTILS_DATA=
     20764
     20765
     20766if test $coin_has_coinutils != "skipping" ; then
     20767  # if the project is available and configured, then a project-uninstalled.pc file should have been created
     20768  if test -r ../CoinUtils/coinutils-uninstalled.pc ; then
     20769    # read CFLAGS and LIBS from coinutils-uninstalled.pc file
     20770    # add CYGPATH_W cludge into include flags
     20771    # replace -L${libdir} by absolute path to build directory in linker flags
     20772    # we assume that the build directory is ../CoinUtils/src if this directory exists, otherwise we assume that it is ../CoinUtils
     20773    COINUTILS_CFLAGS=`sed -n -e 's/Cflags://' -e 's/-I\([^ ]*\)/-I\`${CYGPATH_W} \1\`/gp' ../CoinUtils/coinutils-uninstalled.pc`
     20774    projectlibs=`sed -n -e 's/Libs://' -e 's/-L\${libdir}//p' ../CoinUtils/coinutils-uninstalled.pc`
     20775    if test "x$projectlibs" != x ; then
     20776      if test -d ../CoinUtils/src ; then
     20777        COINUTILS_LIBS="-L`cd ../CoinUtils/src; pwd` $projectlibs"
     20778      else
     20779        COINUTILS_LIBS="-L`cd ../CoinUtils; pwd` $projectlibs"
     20780      fi
     20781    fi
     20782    COINUTILS_DATA=`sed -n -e 's/datadir=//gp' ../CoinUtils/coinutils-uninstalled.pc`
     20783
     20784    ADDLIBS="$ADDLIBS $COINUTILS_LIBS"
     20785
     20786    REQUIREDPACKAGES="$REQUIREDPACKAGES coinutils"
     20787
     20788
     20789cat >>confdefs.h <<\_ACEOF
     20790#define COIN_HAS_COINUTILS 1
     20791_ACEOF
     20792
     20793
     20794
     20795    coin_has_coinutils=yes
     20796  fi
     20797fi
     20798
     20799#if user did not disable setting of makefile conditional, do it
     20800
     20801
     20802if test $coin_has_coinutils != notGiven &&
     20803                test $coin_has_coinutils != skipping; then
     20804  COIN_HAS_COINUTILS_TRUE=
     20805  COIN_HAS_COINUTILS_FALSE='#'
     20806else
     20807  COIN_HAS_COINUTILS_TRUE='#'
     20808  COIN_HAS_COINUTILS_FALSE=
     20809fi
     20810
     20811
     20812
     20813echo "$as_me:$LINENO: result: $coin_has_coinutils" >&5
     20814echo "${ECHO_T}$coin_has_coinutils" >&6
     20815fi
     20816
     20817if test $coin_has_coinutils != yes ; then
     20818  { { echo "$as_me:$LINENO: error: Required package CoinUtils not available." >&5
     20819echo "$as_me: error: Required package CoinUtils not available." >&2;}
     20820   { (exit 1); exit 1; }; }
     20821fi
     20822
     20823
     20824echo "$as_me:$LINENO: checking for COIN-OR module Osi" >&5
     20825echo $ECHO_N "checking for COIN-OR module Osi... $ECHO_C" >&6
    2075520826
    2075620827coin_has_osi=notGiven
     
    2077320844
    2077420845
    20775 required=1
    20776 
    20777 # execute third argument that can be used to overwrite flags like 'required'
    20778 required=0
    20779 
    2078020846#check if user provided LIBS, CFLAGS, and DATA for module
    2078120847if test $coin_has_osi != skipping; then
     
    2078720853  coin_has_osi=yes
    2078820854       OSI_LIBS="$withval"
    20789        if test $required = 1; then
    20790          ADDLIBS="$ADDLIBS $withval"
    20791        fi
     20855
    2079220856
    2079320857fi;
     
    2087420938        echo "$as_me:$LINENO: result: yes: $OSI_VERSIONS" >&5
    2087520939echo "${ECHO_T}yes: $OSI_VERSIONS" >&6
    20876         if test $required = 1; then
    20877           REQUIREDPACKAGES="$REQUIREDPACKAGES osi"
    20878         fi
     20940
    2087920941
    2088020942
     
    2090820970if test $coin_has_osi != skipping &&
    2090920971   test $coin_has_osi != notGiven ; then
     20972  if test 0 = 1 ; then  #change this test to enable a bit of debugging output
    2091020973  if test -n "$OSI_CFLAGS" ; then
    2091120974    { echo "$as_me:$LINENO: Osi CFLAGS are $OSI_CFLAGS" >&5
     
    2091920982    { echo "$as_me:$LINENO: Osi DATA   is  $OSI_DATA" >&5
    2092020983echo "$as_me: Osi DATA   is  $OSI_DATA" >&6;}
     20984  fi
    2092120985  fi
    2092220986
     
    2094221006
    2094321007
    20944 echo "$as_me:$LINENO: checking for COIN module OsiTests" >&5
    20945 echo $ECHO_N "checking for COIN module OsiTests... $ECHO_C" >&6
     21008if test $coin_has_osi != "yes" ; then
     21009echo "$as_me:$LINENO: checking for COIN-OR module Osi (fallback)" >&5
     21010echo $ECHO_N "checking for COIN-OR module Osi (fallback)... $ECHO_C" >&6
     21011
     21012coin_has_osi=notGiven
     21013
     21014# check if user wants to skip module in any case
     21015if test x"$COIN_SKIP_PROJECTS" != x; then
     21016  for dir in $COIN_SKIP_PROJECTS; do
     21017    if test $dir = "Osi"; then
     21018      coin_has_osi=skipping
     21019    fi
     21020  done
     21021fi
     21022
     21023OSI_LIBS=
     21024OSI_CFLAGS=
     21025OSI_DATA=
     21026
     21027
     21028if test $coin_has_osi != "skipping" ; then
     21029  # if the project is available and configured, then a project-uninstalled.pc file should have been created
     21030  if test -r ../Osi/osi-uninstalled.pc ; then
     21031    # read CFLAGS and LIBS from osi-uninstalled.pc file
     21032    # add CYGPATH_W cludge into include flags
     21033    # replace -L${libdir} by absolute path to build directory in linker flags
     21034    # we assume that the build directory is ../Osi/src if this directory exists, otherwise we assume that it is ../Osi
     21035    OSI_CFLAGS=`sed -n -e 's/Cflags://' -e 's/-I\([^ ]*\)/-I\`${CYGPATH_W} \1\`/gp' ../Osi/osi-uninstalled.pc`
     21036    projectlibs=`sed -n -e 's/Libs://' -e 's/-L\${libdir}//p' ../Osi/osi-uninstalled.pc`
     21037    if test "x$projectlibs" != x ; then
     21038      if test -d ../Osi/src ; then
     21039        OSI_LIBS="-L`cd ../Osi/src; pwd` $projectlibs"
     21040      else
     21041        OSI_LIBS="-L`cd ../Osi; pwd` $projectlibs"
     21042      fi
     21043    fi
     21044    OSI_DATA=`sed -n -e 's/datadir=//gp' ../Osi/osi-uninstalled.pc`
     21045
     21046    ADDLIBS="$ADDLIBS $OSI_LIBS"
     21047
     21048
     21049
     21050
     21051cat >>confdefs.h <<\_ACEOF
     21052#define COIN_HAS_OSI 1
     21053_ACEOF
     21054
     21055
     21056
     21057    coin_has_osi=yes
     21058  fi
     21059fi
     21060
     21061#if user did not disable setting of makefile conditional, do it
     21062
     21063
     21064if test $coin_has_osi != notGiven &&
     21065                test $coin_has_osi != skipping; then
     21066  COIN_HAS_OSI_TRUE=
     21067  COIN_HAS_OSI_FALSE='#'
     21068else
     21069  COIN_HAS_OSI_TRUE='#'
     21070  COIN_HAS_OSI_FALSE=
     21071fi
     21072
     21073
     21074
     21075echo "$as_me:$LINENO: result: $coin_has_osi" >&5
     21076echo "${ECHO_T}$coin_has_osi" >&6
     21077fi
     21078
     21079
     21080echo "$as_me:$LINENO: checking for COIN-OR module OsiTests" >&5
     21081echo $ECHO_N "checking for COIN-OR module OsiTests... $ECHO_C" >&6
    2094621082
    2094721083coin_has_ositests=notGiven
     
    2096421100
    2096521101
    20966 required=1
    20967 
    20968 # execute third argument that can be used to overwrite flags like 'required'
    20969 required=0
    20970 
    2097121102#check if user provided LIBS, CFLAGS, and DATA for module
    2097221103if test $coin_has_ositests != skipping; then
     
    2097821109  coin_has_ositests=yes
    2097921110       OSITESTS_LIBS="$withval"
    20980        if test $required = 1; then
    20981          ADDLIBS="$ADDLIBS $withval"
    20982        fi
     21111
    2098321112
    2098421113fi;
     
    2106521194        echo "$as_me:$LINENO: result: yes: $OSITESTS_VERSIONS" >&5
    2106621195echo "${ECHO_T}yes: $OSITESTS_VERSIONS" >&6
    21067         if test $required = 1; then
    21068           REQUIREDPACKAGES="$REQUIREDPACKAGES osi-unittests"
    21069         fi
     21196
    2107021197
    2107121198
     
    2109921226if test $coin_has_ositests != skipping &&
    2110021227   test $coin_has_ositests != notGiven ; then
     21228  if test 0 = 1 ; then  #change this test to enable a bit of debugging output
    2110121229  if test -n "$OSITESTS_CFLAGS" ; then
    2110221230    { echo "$as_me:$LINENO: OsiTests CFLAGS are $OSITESTS_CFLAGS" >&5
     
    2111021238    { echo "$as_me:$LINENO: OsiTests DATA   is  $OSITESTS_DATA" >&5
    2111121239echo "$as_me: OsiTests DATA   is  $OSITESTS_DATA" >&6;}
     21240  fi
    2111221241  fi
    2111321242
     
    2113321262
    2113421263
    21135 echo "$as_me:$LINENO: checking for COIN module Sample" >&5
    21136 echo $ECHO_N "checking for COIN module Sample... $ECHO_C" >&6
     21264if test $coin_has_ositests != "yes" ; then
     21265echo "$as_me:$LINENO: checking for COIN-OR module OsiTests (fallback)" >&5
     21266echo $ECHO_N "checking for COIN-OR module OsiTests (fallback)... $ECHO_C" >&6
     21267
     21268coin_has_ositests=notGiven
     21269
     21270# check if user wants to skip module in any case
     21271if test x"$COIN_SKIP_PROJECTS" != x; then
     21272  for dir in $COIN_SKIP_PROJECTS; do
     21273    if test $dir = "OsiTests"; then
     21274      coin_has_ositests=skipping
     21275    fi
     21276  done
     21277fi
     21278
     21279OSITESTS_LIBS=
     21280OSITESTS_CFLAGS=
     21281OSITESTS_DATA=
     21282
     21283
     21284if test $coin_has_ositests != "skipping" ; then
     21285  # if the project is available and configured, then a project-uninstalled.pc file should have been created
     21286  if test -r ../Osi/osi-unittests-uninstalled.pc ; then
     21287    # read CFLAGS and LIBS from osi-unittests-uninstalled.pc file
     21288    # add CYGPATH_W cludge into include flags
     21289    # replace -L${libdir} by absolute path to build directory in linker flags
     21290    # we assume that the build directory is ../Osi/src if this directory exists, otherwise we assume that it is ../Osi
     21291    OSITESTS_CFLAGS=`sed -n -e 's/Cflags://' -e 's/-I\([^ ]*\)/-I\`${CYGPATH_W} \1\`/gp' ../Osi/osi-unittests-uninstalled.pc`
     21292    projectlibs=`sed -n -e 's/Libs://' -e 's/-L\${libdir}//p' ../Osi/osi-unittests-uninstalled.pc`
     21293    if test "x$projectlibs" != x ; then
     21294      if test -d ../Osi/src ; then
     21295        OSITESTS_LIBS="-L`cd ../Osi/src; pwd` $projectlibs"
     21296      else
     21297        OSITESTS_LIBS="-L`cd ../Osi; pwd` $projectlibs"
     21298      fi
     21299    fi
     21300    OSITESTS_DATA=`sed -n -e 's/datadir=//gp' ../Osi/osi-unittests-uninstalled.pc`
     21301
     21302    ADDLIBS="$ADDLIBS $OSITESTS_LIBS"
     21303
     21304
     21305
     21306
     21307cat >>confdefs.h <<\_ACEOF
     21308#define COIN_HAS_OSITESTS 1
     21309_ACEOF
     21310
     21311
     21312
     21313    coin_has_ositests=yes
     21314  fi
     21315fi
     21316
     21317#if user did not disable setting of makefile conditional, do it
     21318
     21319
     21320if test $coin_has_ositests != notGiven &&
     21321                test $coin_has_ositests != skipping; then
     21322  COIN_HAS_OSITESTS_TRUE=
     21323  COIN_HAS_OSITESTS_FALSE='#'
     21324else
     21325  COIN_HAS_OSITESTS_TRUE='#'
     21326  COIN_HAS_OSITESTS_FALSE=
     21327fi
     21328
     21329
     21330
     21331echo "$as_me:$LINENO: result: $coin_has_ositests" >&5
     21332echo "${ECHO_T}$coin_has_ositests" >&6
     21333fi
     21334
     21335
     21336
     21337echo "$as_me:$LINENO: checking for COIN-OR module Sample" >&5
     21338echo $ECHO_N "checking for COIN-OR module Sample... $ECHO_C" >&6
    2113721339
    2113821340coin_has_sample=notGiven
     
    2115521357
    2115621358
    21157 required=1
    21158 
    21159 # execute third argument that can be used to overwrite flags like 'required'
    21160 required=0
    21161 
    2116221359#check if user provided LIBS, CFLAGS, and DATA for module
    2116321360if test $coin_has_sample != skipping; then
     
    2116921366  coin_has_sample=yes
    2117021367       SAMPLE_LIBS="$withval"
    21171        if test $required = 1; then
    21172          ADDLIBS="$ADDLIBS $withval"
    21173        fi
     21368
    2117421369
    2117521370fi;
     
    2125621451        echo "$as_me:$LINENO: result: yes: $SAMPLE_VERSIONS" >&5
    2125721452echo "${ECHO_T}yes: $SAMPLE_VERSIONS" >&6
    21258         if test $required = 1; then
    21259           REQUIREDPACKAGES="$REQUIREDPACKAGES coindatasample"
    21260         fi
     21453
    2126121454
    2126221455
     
    2129021483if test $coin_has_sample != skipping &&
    2129121484   test $coin_has_sample != notGiven ; then
     21485  if test 0 = 1 ; then  #change this test to enable a bit of debugging output
    2129221486  if test -n "$SAMPLE_CFLAGS" ; then
    2129321487    { echo "$as_me:$LINENO: Sample CFLAGS are $SAMPLE_CFLAGS" >&5
     
    2130121495    { echo "$as_me:$LINENO: Sample DATA   is  $SAMPLE_DATA" >&5
    2130221496echo "$as_me: Sample DATA   is  $SAMPLE_DATA" >&6;}
     21497  fi
    2130321498  fi
    2130421499
     
    2132421519
    2132521520
    21326 echo "$as_me:$LINENO: checking for COIN module Netlib" >&5
    21327 echo $ECHO_N "checking for COIN module Netlib... $ECHO_C" >&6
     21521if test $coin_has_sample != "yes" ; then
     21522echo "$as_me:$LINENO: checking for COIN-OR module Sample (fallback)" >&5
     21523echo $ECHO_N "checking for COIN-OR module Sample (fallback)... $ECHO_C" >&6
     21524
     21525coin_has_sample=notGiven
     21526
     21527# check if user wants to skip module in any case
     21528if test x"$COIN_SKIP_PROJECTS" != x; then
     21529  for dir in $COIN_SKIP_PROJECTS; do
     21530    if test $dir = "Sample"; then
     21531      coin_has_sample=skipping
     21532    fi
     21533  done
     21534fi
     21535
     21536SAMPLE_LIBS=
     21537SAMPLE_CFLAGS=
     21538SAMPLE_DATA=
     21539
     21540
     21541if test $coin_has_sample != "skipping" ; then
     21542  # if the project is available and configured, then a project-uninstalled.pc file should have been created
     21543  if test -r ../Data/Sample/coindatasample-uninstalled.pc ; then
     21544    # read CFLAGS and LIBS from coindatasample-uninstalled.pc file
     21545    # add CYGPATH_W cludge into include flags
     21546    # replace -L${libdir} by absolute path to build directory in linker flags
     21547    # we assume that the build directory is ../Data/Sample/src if this directory exists, otherwise we assume that it is ../Data/Sample
     21548    SAMPLE_CFLAGS=`sed -n -e 's/Cflags://' -e 's/-I\([^ ]*\)/-I\`${CYGPATH_W} \1\`/gp' ../Data/Sample/coindatasample-uninstalled.pc`
     21549    projectlibs=`sed -n -e 's/Libs://' -e 's/-L\${libdir}//p' ../Data/Sample/coindatasample-uninstalled.pc`
     21550    if test "x$projectlibs" != x ; then
     21551      if test -d ../Data/Sample/src ; then
     21552        SAMPLE_LIBS="-L`cd ../Data/Sample/src; pwd` $projectlibs"
     21553      else
     21554        SAMPLE_LIBS="-L`cd ../Data/Sample; pwd` $projectlibs"
     21555      fi
     21556    fi
     21557    SAMPLE_DATA=`sed -n -e 's/datadir=//gp' ../Data/Sample/coindatasample-uninstalled.pc`
     21558
     21559    ADDLIBS="$ADDLIBS $SAMPLE_LIBS"
     21560
     21561
     21562
     21563
     21564cat >>confdefs.h <<\_ACEOF
     21565#define COIN_HAS_SAMPLE 1
     21566_ACEOF
     21567
     21568
     21569
     21570    coin_has_sample=yes
     21571  fi
     21572fi
     21573
     21574#if user did not disable setting of makefile conditional, do it
     21575
     21576
     21577if test $coin_has_sample != notGiven &&
     21578                test $coin_has_sample != skipping; then
     21579  COIN_HAS_SAMPLE_TRUE=
     21580  COIN_HAS_SAMPLE_FALSE='#'
     21581else
     21582  COIN_HAS_SAMPLE_TRUE='#'
     21583  COIN_HAS_SAMPLE_FALSE=
     21584fi
     21585
     21586
     21587
     21588echo "$as_me:$LINENO: result: $coin_has_sample" >&5
     21589echo "${ECHO_T}$coin_has_sample" >&6
     21590fi
     21591
     21592
     21593
     21594echo "$as_me:$LINENO: checking for COIN-OR module Netlib" >&5
     21595echo $ECHO_N "checking for COIN-OR module Netlib... $ECHO_C" >&6
    2132821596
    2132921597coin_has_netlib=notGiven
     
    2134621614
    2134721615
    21348 required=1
    21349 
    21350 # execute third argument that can be used to overwrite flags like 'required'
    21351 required=0
    21352 
    2135321616#check if user provided LIBS, CFLAGS, and DATA for module
    2135421617if test $coin_has_netlib != skipping; then
     
    2136021623  coin_has_netlib=yes
    2136121624       NETLIB_LIBS="$withval"
    21362        if test $required = 1; then
    21363          ADDLIBS="$ADDLIBS $withval"
    21364        fi
     21625
    2136521626
    2136621627fi;
     
    2144721708        echo "$as_me:$LINENO: result: yes: $NETLIB_VERSIONS" >&5
    2144821709echo "${ECHO_T}yes: $NETLIB_VERSIONS" >&6
    21449         if test $required = 1; then
    21450           REQUIREDPACKAGES="$REQUIREDPACKAGES coindatanetlib"
    21451         fi
     21710
    2145221711
    2145321712
     
    2148121740if test $coin_has_netlib != skipping &&
    2148221741   test $coin_has_netlib != notGiven ; then
     21742  if test 0 = 1 ; then  #change this test to enable a bit of debugging output
    2148321743  if test -n "$NETLIB_CFLAGS" ; then
    2148421744    { echo "$as_me:$LINENO: Netlib CFLAGS are $NETLIB_CFLAGS" >&5
     
    2149221752    { echo "$as_me:$LINENO: Netlib DATA   is  $NETLIB_DATA" >&5
    2149321753echo "$as_me: Netlib DATA   is  $NETLIB_DATA" >&6;}
     21754  fi
    2149421755  fi
    2149521756
     
    2151521776
    2151621777
    21517 # fallbacks if no pkg-config is available
    21518 if test "$coin_has_coinutils" != yes ; then
    21519   echo "$as_me:$LINENO: checking for COIN project CoinUtils" >&5
    21520 echo $ECHO_N "checking for COIN project CoinUtils... $ECHO_C" >&6
    21521 
    21522 # First check, if the sub-project is actually available (ToDo: allow
    21523 # other locations)
    21524 
    21525 coin_has_coinutils=unavailable
     21778if test $coin_has_netlib != "yes" ; then
     21779echo "$as_me:$LINENO: checking for COIN-OR module Netlib (fallback)" >&5
     21780echo $ECHO_N "checking for COIN-OR module Netlib (fallback)... $ECHO_C" >&6
     21781
     21782coin_has_netlib=notGiven
     21783
     21784# check if user wants to skip module in any case
    2152621785if test x"$COIN_SKIP_PROJECTS" != x; then
    2152721786  for dir in $COIN_SKIP_PROJECTS; do
    21528     if test $dir = CoinUtils; then
    21529       coin_has_coinutils=skipping
     21787    if test $dir = "Netlib"; then
     21788      coin_has_netlib=skipping
    2153021789    fi
    2153121790  done
    2153221791fi
    2153321792
    21534 if test $coin_has_coinutils != skipping; then
    21535   if test $PACKAGE_TARNAME = coinutils; then
    21536     coin_has_coinutils=.
    21537   else
    21538     if test -d $srcdir/../CoinUtils; then
    21539       coin_has_coinutils=../CoinUtils
     21793NETLIB_LIBS=
     21794NETLIB_CFLAGS=
     21795NETLIB_DATA=
     21796
     21797
     21798if test $coin_has_netlib != "skipping" ; then
     21799  # if the project is available and configured, then a project-uninstalled.pc file should have been created
     21800  if test -r ../Data/Netlib/coindatanetlib-uninstalled.pc ; then
     21801    # read CFLAGS and LIBS from coindatanetlib-uninstalled.pc file
     21802    # add CYGPATH_W cludge into include flags
     21803    # replace -L${libdir} by absolute path to build directory in linker flags
     21804    # we assume that the build directory is ../Data/Netlib/src if this directory exists, otherwise we assume that it is ../Data/Netlib
     21805    NETLIB_CFLAGS=`sed -n -e 's/Cflags://' -e 's/-I\([^ ]*\)/-I\`${CYGPATH_W} \1\`/gp' ../Data/Netlib/coindatanetlib-uninstalled.pc`
     21806    projectlibs=`sed -n -e 's/Libs://' -e 's/-L\${libdir}//p' ../Data/Netlib/coindatanetlib-uninstalled.pc`
     21807    if test "x$projectlibs" != x ; then
     21808      if test -d ../Data/Netlib/src ; then
     21809        NETLIB_LIBS="-L`cd ../Data/Netlib/src; pwd` $projectlibs"
     21810      else
     21811        NETLIB_LIBS="-L`cd ../Data/Netlib; pwd` $projectlibs"
     21812      fi
    2154021813    fi
    21541   fi
    21542 fi
    21543 
    21544 if test $coin_has_coinutils != unavailable &&
    21545    test $coin_has_coinutils != skipping; then
    21546   # Set the #define if the component is available
     21814    NETLIB_DATA=`sed -n -e 's/datadir=//gp' ../Data/Netlib/coindatanetlib-uninstalled.pc`
     21815
     21816    ADDLIBS="$ADDLIBS $NETLIB_LIBS"
     21817
     21818
     21819
    2154721820
    2154821821cat >>confdefs.h <<\_ACEOF
    21549 #define COIN_HAS_COINUTILS 1
     21822#define COIN_HAS_NETLIB 1
    2155021823_ACEOF
    2155121824
    2155221825
    21553   # Set the variables for source and object code location
    21554 
    21555   COINUTILSSRCDIR=`cd $srcdir/$coin_has_coinutils; pwd`
    21556 
    21557   COINUTILSOBJDIR=`pwd`/$coin_has_coinutils
    21558 
    21559   COINUTILSDOCDIR=$abs_lib_dir/../share/doc/coin/CoinUtils
    21560 fi
    21561 
    21562   # Define the Makefile conditional
    21563 
    21564 
    21565 if test $coin_has_coinutils != unavailable &&
    21566                 test $coin_has_coinutils != skipping; then
    21567   COIN_HAS_COINUTILS_TRUE=
    21568   COIN_HAS_COINUTILS_FALSE='#'
    21569 else
    21570   COIN_HAS_COINUTILS_TRUE='#'
    21571   COIN_HAS_COINUTILS_FALSE=
    21572 fi
    21573 
    21574 echo "$as_me:$LINENO: result: $coin_has_coinutils" >&5
    21575 echo "${ECHO_T}$coin_has_coinutils" >&6
    21576 
    21577   if test $coin_has_coinutils != notGiven && test $coin_has_coinutils != skipping ; then
    21578     COINUTILS_CFLAGS="-I`${CYGPATH_W} ${COINUTILSSRCDIR}/src` -I`${CYGPATH_W} ${COINUTILSOBJDIR}/inc`"
    21579     COINUTILS_LIBS="${COINUTILSOBJDIR}/src/libCoinUtils.la `cat ${COINUTILSOBJDIR}/coinutils_addlibs.txt`"
    21580   else
    21581     { { echo "$as_me:$LINENO: error: \"Required package CoinUtils unavailable.\"" >&5
    21582 echo "$as_me: error: \"Required package CoinUtils unavailable.\"" >&2;}
    21583    { (exit 1); exit 1; }; }
    21584   fi
    21585 fi
    21586 
    21587 if test "$coin_has_osi" != yes ; then
    21588   echo "$as_me:$LINENO: checking for COIN project Osi" >&5
    21589 echo $ECHO_N "checking for COIN project Osi... $ECHO_C" >&6
    21590 
    21591 # First check, if the sub-project is actually available (ToDo: allow
    21592 # other locations)
    21593 
    21594 coin_has_osi=unavailable
    21595 if test x"$COIN_SKIP_PROJECTS" != x; then
    21596   for dir in $COIN_SKIP_PROJECTS; do
    21597     if test $dir = Osi; then
    21598       coin_has_osi=skipping
    21599     fi
    21600   done
    21601 fi
    21602 
    21603 if test $coin_has_osi != skipping; then
    21604   if test $PACKAGE_TARNAME = osi; then
    21605     coin_has_osi=.
    21606   else
    21607     if test -d $srcdir/../Osi; then
    21608       coin_has_osi=../Osi
    21609     fi
    21610   fi
    21611 fi
    21612 
    21613 if test $coin_has_osi != unavailable &&
    21614    test $coin_has_osi != skipping; then
    21615   # Set the #define if the component is available
    21616 
    21617 cat >>confdefs.h <<\_ACEOF
    21618 #define COIN_HAS_OSI 1
    21619 _ACEOF
    21620 
    21621 
    21622   # Set the variables for source and object code location
    21623 
    21624   OSISRCDIR=`cd $srcdir/$coin_has_osi; pwd`
    21625 
    21626   OSIOBJDIR=`pwd`/$coin_has_osi
    21627 
    21628   OSIDOCDIR=$abs_lib_dir/../share/doc/coin/Osi
    21629 fi
    21630 
    21631   # Define the Makefile conditional
    21632 
    21633 
    21634 if test $coin_has_osi != unavailable &&
    21635                 test $coin_has_osi != skipping; then
    21636   COIN_HAS_OSI_TRUE=
    21637   COIN_HAS_OSI_FALSE='#'
    21638 else
    21639   COIN_HAS_OSI_TRUE='#'
    21640   COIN_HAS_OSI_FALSE=
    21641 fi
    21642 
    21643 echo "$as_me:$LINENO: result: $coin_has_osi" >&5
    21644 echo "${ECHO_T}$coin_has_osi" >&6
    21645 
    21646   if test $coin_has_osi != notGiven && test $coin_has_osi != skipping ; then
    21647     OSI_CFLAGS="-I`${CYGPATH_W} ${OSISRCDIR}/src` -I`${CYGPATH_W} ${OSIOBJDIR}/inc`"
    21648     OSI_LIBS="${OSIOBJDIR}/src/libOsi.la `cat ${OSIOBJDIR}/osi_addlibs.txt`"
    21649   fi
    21650 fi
     21826
     21827    coin_has_netlib=yes
     21828  fi
     21829fi
     21830
     21831#if user did not disable setting of makefile conditional, do it
     21832
     21833
     21834if test $coin_has_netlib != notGiven &&
     21835                test $coin_has_netlib != skipping; then
     21836  COIN_HAS_NETLIB_TRUE=
     21837  COIN_HAS_NETLIB_FALSE='#'
     21838else
     21839  COIN_HAS_NETLIB_TRUE='#'
     21840  COIN_HAS_NETLIB_FALSE=
     21841fi
     21842
     21843
     21844
     21845echo "$as_me:$LINENO: result: $coin_has_netlib" >&5
     21846echo "${ECHO_T}$coin_has_netlib" >&6
     21847fi
     21848
    2165121849
    2165221850#############################################################################
     
    2235922557   { (exit 1); exit 1; }; }
    2236022558fi
     22559if test -z "${COIN_HAS_COINUTILS_TRUE}" && test -z "${COIN_HAS_COINUTILS_FALSE}"; then
     22560  { { echo "$as_me:$LINENO: error: conditional \"COIN_HAS_COINUTILS\" was never defined.
     22561Usually this means the macro was only invoked conditionally." >&5
     22562echo "$as_me: error: conditional \"COIN_HAS_COINUTILS\" was never defined.
     22563Usually this means the macro was only invoked conditionally." >&2;}
     22564   { (exit 1); exit 1; }; }
     22565fi
    2236122566if test -z "${COIN_HAS_OSI_TRUE}" && test -z "${COIN_HAS_OSI_FALSE}"; then
    2236222567  { { echo "$as_me:$LINENO: error: conditional \"COIN_HAS_OSI\" was never defined.
     
    2236622571   { (exit 1); exit 1; }; }
    2236722572fi
     22573if test -z "${COIN_HAS_OSI_TRUE}" && test -z "${COIN_HAS_OSI_FALSE}"; then
     22574  { { echo "$as_me:$LINENO: error: conditional \"COIN_HAS_OSI\" was never defined.
     22575Usually this means the macro was only invoked conditionally." >&5
     22576echo "$as_me: error: conditional \"COIN_HAS_OSI\" was never defined.
     22577Usually this means the macro was only invoked conditionally." >&2;}
     22578   { (exit 1); exit 1; }; }
     22579fi
    2236822580if test -z "${COIN_HAS_OSITESTS_TRUE}" && test -z "${COIN_HAS_OSITESTS_FALSE}"; then
    2236922581  { { echo "$as_me:$LINENO: error: conditional \"COIN_HAS_OSITESTS\" was never defined.
     
    2237322585   { (exit 1); exit 1; }; }
    2237422586fi
     22587if test -z "${COIN_HAS_OSITESTS_TRUE}" && test -z "${COIN_HAS_OSITESTS_FALSE}"; then
     22588  { { echo "$as_me:$LINENO: error: conditional \"COIN_HAS_OSITESTS\" was never defined.
     22589Usually this means the macro was only invoked conditionally." >&5
     22590echo "$as_me: error: conditional \"COIN_HAS_OSITESTS\" was never defined.
     22591Usually this means the macro was only invoked conditionally." >&2;}
     22592   { (exit 1); exit 1; }; }
     22593fi
    2237522594if test -z "${COIN_HAS_SAMPLE_TRUE}" && test -z "${COIN_HAS_SAMPLE_FALSE}"; then
    2237622595  { { echo "$as_me:$LINENO: error: conditional \"COIN_HAS_SAMPLE\" was never defined.
     
    2238022599   { (exit 1); exit 1; }; }
    2238122600fi
     22601if test -z "${COIN_HAS_SAMPLE_TRUE}" && test -z "${COIN_HAS_SAMPLE_FALSE}"; then
     22602  { { echo "$as_me:$LINENO: error: conditional \"COIN_HAS_SAMPLE\" was never defined.
     22603Usually this means the macro was only invoked conditionally." >&5
     22604echo "$as_me: error: conditional \"COIN_HAS_SAMPLE\" was never defined.
     22605Usually this means the macro was only invoked conditionally." >&2;}
     22606   { (exit 1); exit 1; }; }
     22607fi
    2238222608if test -z "${COIN_HAS_NETLIB_TRUE}" && test -z "${COIN_HAS_NETLIB_FALSE}"; then
    2238322609  { { echo "$as_me:$LINENO: error: conditional \"COIN_HAS_NETLIB\" was never defined.
     
    2238722613   { (exit 1); exit 1; }; }
    2238822614fi
    22389 if test -z "${COIN_HAS_COINUTILS_TRUE}" && test -z "${COIN_HAS_COINUTILS_FALSE}"; then
    22390   { { echo "$as_me:$LINENO: error: conditional \"COIN_HAS_COINUTILS\" was never defined.
     22615if test -z "${COIN_HAS_NETLIB_TRUE}" && test -z "${COIN_HAS_NETLIB_FALSE}"; then
     22616  { { echo "$as_me:$LINENO: error: conditional \"COIN_HAS_NETLIB\" was never defined.
    2239122617Usually this means the macro was only invoked conditionally." >&5
    22392 echo "$as_me: error: conditional \"COIN_HAS_COINUTILS\" was never defined.
    22393 Usually this means the macro was only invoked conditionally." >&2;}
    22394    { (exit 1); exit 1; }; }
    22395 fi
    22396 if test -z "${COIN_HAS_OSI_TRUE}" && test -z "${COIN_HAS_OSI_FALSE}"; then
    22397   { { echo "$as_me:$LINENO: error: conditional \"COIN_HAS_OSI\" was never defined.
    22398 Usually this means the macro was only invoked conditionally." >&5
    22399 echo "$as_me: error: conditional \"COIN_HAS_OSI\" was never defined.
     22618echo "$as_me: error: conditional \"COIN_HAS_NETLIB\" was never defined.
    2240022619Usually this means the macro was only invoked conditionally." >&2;}
    2240122620   { (exit 1); exit 1; }; }
     
    2306923288s,@COIN_HAS_NETLIB_TRUE@,$COIN_HAS_NETLIB_TRUE,;t t
    2307023289s,@COIN_HAS_NETLIB_FALSE@,$COIN_HAS_NETLIB_FALSE,;t t
    23071 s,@COINUTILSSRCDIR@,$COINUTILSSRCDIR,;t t
    23072 s,@COINUTILSOBJDIR@,$COINUTILSOBJDIR,;t t
    23073 s,@COINUTILSDOCDIR@,$COINUTILSDOCDIR,;t t
    23074 s,@OSISRCDIR@,$OSISRCDIR,;t t
    23075 s,@OSIOBJDIR@,$OSIOBJDIR,;t t
    23076 s,@OSIDOCDIR@,$OSIDOCDIR,;t t
    2307723290s,@LIBEXT@,$LIBEXT,;t t
    2307823291s,@VPATH_DISTCLEANFILES@,$VPATH_DISTCLEANFILES,;t t
  • branches/split/Clp/configure.ac

    r1530 r1542  
    5454
    5555#############################################################################
    56 #                              COIN components                              #
     56#                              COIN-OR components                           #
    5757#############################################################################
    5858
    59 AC_COIN_HAS_MODULE(CoinUtils,  [coinutils = split])
    60 AC_COIN_HAS_MODULE(Osi,        [osi],            [required=0])
    61 AC_COIN_HAS_MODULE(OsiTests,   [osi-unittests],  [required=0])
    62 AC_COIN_HAS_MODULE(Sample,     [coindatasample], [required=0])
    63 AC_COIN_HAS_MODULE(Netlib,     [coindatanetlib], [required=0])
    64 
    65 # fallbacks if no pkg-config is available
    66 if test "$coin_has_coinutils" != yes ; then
    67   AC_COIN_HAS_PROJECT(CoinUtils)
    68   if test $coin_has_coinutils != notGiven && test $coin_has_coinutils != skipping ; then
    69     COINUTILS_CFLAGS="-I`${CYGPATH_W} ${COINUTILSSRCDIR}/src` -I`${CYGPATH_W} ${COINUTILSOBJDIR}/inc`"
    70     COINUTILS_LIBS="${COINUTILSOBJDIR}/src/libCoinUtils.la `cat ${COINUTILSOBJDIR}/coinutils_addlibs.txt`"
    71   else
    72     AC_MSG_ERROR("Required package CoinUtils unavailable.")
    73   fi
     59AC_COIN_HAS_MODULE(CoinUtils,          [coinutils = split])
     60AC_COIN_HAS_MODULE_FALLBACK(CoinUtils, [coinutils], [../CoinUtils])
     61if test $coin_has_coinutils != yes ; then
     62  AC_MSG_ERROR([Required package CoinUtils not available.])
    7463fi
    7564
    76 if test "$coin_has_osi" != yes ; then
    77   AC_COIN_HAS_PROJECT(Osi)
    78   if test $coin_has_osi != notGiven && test $coin_has_osi != skipping ; then
    79     OSI_CFLAGS="-I`${CYGPATH_W} ${OSISRCDIR}/src` -I`${CYGPATH_W} ${OSIOBJDIR}/inc`"
    80     OSI_LIBS="${OSIOBJDIR}/src/libOsi.la `cat ${OSIOBJDIR}/osi_addlibs.txt`"
    81   fi
    82 fi
     65AC_COIN_HAS_MODULE(Osi,               [osi],                     [required=0])
     66AC_COIN_HAS_MODULE_FALLBACK(Osi,      [osi],           [../Osi], [required=0])
     67AC_COIN_HAS_MODULE(OsiTests,          [osi-unittests],           [required=0])
     68AC_COIN_HAS_MODULE_FALLBACK(OsiTests, [osi-unittests], [../Osi], [required=0])
     69
     70AC_COIN_HAS_MODULE(Sample,          [coindatasample],                   [required=0])
     71AC_COIN_HAS_MODULE_FALLBACK(Sample, [coindatasample], [../Data/Sample], [required=0])
     72
     73AC_COIN_HAS_MODULE(Netlib,          [coindatanetlib],                   [required=0])
     74AC_COIN_HAS_MODULE_FALLBACK(Netlib, [coindatanetlib], [../Data/Netlib], [required=0])
    8375
    8476#############################################################################
  • branches/split/Clp/inc/config_clp.h.in

    r1530 r1542  
    1010#undef COIN_CLP_VERBOSITY
    1111
    12 /* Define to 1 if the CoinUtils package is used */
     12/* Define to 1 if the CoinUtils module is available */
    1313#undef COIN_HAS_COINUTILS
    1414
     
    1616#undef COIN_HAS_NETLIB
    1717
    18 /* Define to 1 if the Osi package is used */
     18/* Define to 1 if the Osi module is available */
    1919#undef COIN_HAS_OSI
    2020
  • branches/split/Clp/src/Makefile.in

    r1530 r1542  
    149149CDEFS = @CDEFS@
    150150CFLAGS = @CFLAGS@
    151 COINUTILSDOCDIR = @COINUTILSDOCDIR@
    152 COINUTILSOBJDIR = @COINUTILSOBJDIR@
    153 COINUTILSSRCDIR = @COINUTILSSRCDIR@
    154151COINUTILS_CFLAGS = @COINUTILS_CFLAGS@
    155152COINUTILS_DATA = @COINUTILS_DATA@
     
    213210OPT_CFLAGS = @OPT_CFLAGS@
    214211OPT_CXXFLAGS = @OPT_CXXFLAGS@
    215 OSIDOCDIR = @OSIDOCDIR@
    216 OSIOBJDIR = @OSIOBJDIR@
    217 OSISRCDIR = @OSISRCDIR@
    218212OSITESTS_CFLAGS = @OSITESTS_CFLAGS@
    219213OSITESTS_DATA = @OSITESTS_DATA@
  • branches/split/Clp/src/OsiClp/Makefile.in

    r1530 r1542  
    117117CDEFS = @CDEFS@
    118118CFLAGS = @CFLAGS@
    119 COINUTILSDOCDIR = @COINUTILSDOCDIR@
    120 COINUTILSOBJDIR = @COINUTILSOBJDIR@
    121 COINUTILSSRCDIR = @COINUTILSSRCDIR@
    122119COINUTILS_CFLAGS = @COINUTILS_CFLAGS@
    123120COINUTILS_DATA = @COINUTILS_DATA@
     
    181178OPT_CFLAGS = @OPT_CFLAGS@
    182179OPT_CXXFLAGS = @OPT_CXXFLAGS@
    183 OSIDOCDIR = @OSIDOCDIR@
    184 OSIOBJDIR = @OSIOBJDIR@
    185 OSISRCDIR = @OSISRCDIR@
    186180OSITESTS_CFLAGS = @OSITESTS_CFLAGS@
    187181OSITESTS_DATA = @OSITESTS_DATA@
  • branches/split/Clp/test/Makefile.in

    r1531 r1542  
    105105CDEFS = @CDEFS@
    106106CFLAGS = @CFLAGS@
    107 COINUTILSDOCDIR = @COINUTILSDOCDIR@
    108 COINUTILSOBJDIR = @COINUTILSOBJDIR@
    109 COINUTILSSRCDIR = @COINUTILSSRCDIR@
    110107COINUTILS_CFLAGS = @COINUTILS_CFLAGS@
    111108COINUTILS_DATA = @COINUTILS_DATA@
     
    169166OPT_CFLAGS = @OPT_CFLAGS@
    170167OPT_CXXFLAGS = @OPT_CXXFLAGS@
    171 OSIDOCDIR = @OSIDOCDIR@
    172 OSIOBJDIR = @OSIOBJDIR@
    173 OSISRCDIR = @OSISRCDIR@
    174168OSITESTS_CFLAGS = @OSITESTS_CFLAGS@
    175169OSITESTS_DATA = @OSITESTS_DATA@
Note: See TracChangeset for help on using the changeset viewer.