Changeset 1530 for branches


Ignore:
Timestamp:
Mar 14, 2010 11:33:24 AM (10 years ago)
Author:
stefan
Message:

add Osi to no pkg-config fallback (not tested)

Location:
branches/split/Clp
Files:
7 edited

Legend:

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

    r1527 r1530  
    200200OPT_CFLAGS = @OPT_CFLAGS@
    201201OPT_CXXFLAGS = @OPT_CXXFLAGS@
     202OSIDOCDIR = @OSIDOCDIR@
     203OSIOBJDIR = @OSIOBJDIR@
     204OSISRCDIR = @OSISRCDIR@
    202205OSITESTS_CFLAGS = @OSITESTS_CFLAGS@
    203206OSITESTS_DATA = @OSITESTS_DATA@
  • branches/split/Clp/configure

    r1527 r1530  
    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 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 COINUTILSSRCDIR COINUTILSOBJDIR COINUTILSDOCDIR OSISRCDIR OSIOBJDIR OSIDOCDIR LIBEXT VPATH_DISTCLEANFILES ABSBUILDDIR LIBOBJS LTLIBOBJS'
    476476ac_subst_files=''
    477477
     
    2151521515
    2151621516
    21517 # fallback if no pkg-config is available
     21517# fallbacks if no pkg-config is available
    2151821518if test "$coin_has_coinutils" != yes ; then
    2151921519  echo "$as_me:$LINENO: checking for COIN project CoinUtils" >&5
     
    2158221582echo "$as_me: error: \"Required package CoinUtils unavailable.\"" >&2;}
    2158321583   { (exit 1); exit 1; }; }
     21584  fi
     21585fi
     21586
     21587if test "$coin_has_osi" != yes ; then
     21588  echo "$as_me:$LINENO: checking for COIN project Osi" >&5
     21589echo $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
     21594coin_has_osi=unavailable
     21595if 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
     21601fi
     21602
     21603if 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
     21611fi
     21612
     21613if test $coin_has_osi != unavailable &&
     21614   test $coin_has_osi != skipping; then
     21615  # Set the #define if the component is available
     21616
     21617cat >>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
     21629fi
     21630
     21631  # Define the Makefile conditional
     21632
     21633
     21634if test $coin_has_osi != unavailable &&
     21635                test $coin_has_osi != skipping; then
     21636  COIN_HAS_OSI_TRUE=
     21637  COIN_HAS_OSI_FALSE='#'
     21638else
     21639  COIN_HAS_OSI_TRUE='#'
     21640  COIN_HAS_OSI_FALSE=
     21641fi
     21642
     21643echo "$as_me:$LINENO: result: $coin_has_osi" >&5
     21644echo "${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`"
    2158421649  fi
    2158521650fi
     
    2232622391Usually this means the macro was only invoked conditionally." >&5
    2232722392echo "$as_me: error: conditional \"COIN_HAS_COINUTILS\" was never defined.
     22393Usually this means the macro was only invoked conditionally." >&2;}
     22394   { (exit 1); exit 1; }; }
     22395fi
     22396if 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.
     22398Usually this means the macro was only invoked conditionally." >&5
     22399echo "$as_me: error: conditional \"COIN_HAS_OSI\" was never defined.
    2232822400Usually this means the macro was only invoked conditionally." >&2;}
    2232922401   { (exit 1); exit 1; }; }
     
    2300023072s,@COINUTILSOBJDIR@,$COINUTILSOBJDIR,;t t
    2300123073s,@COINUTILSDOCDIR@,$COINUTILSDOCDIR,;t t
     23074s,@OSISRCDIR@,$OSISRCDIR,;t t
     23075s,@OSIOBJDIR@,$OSIOBJDIR,;t t
     23076s,@OSIDOCDIR@,$OSIDOCDIR,;t t
    2300223077s,@LIBEXT@,$LIBEXT,;t t
    2300323078s,@VPATH_DISTCLEANFILES@,$VPATH_DISTCLEANFILES,;t t
  • branches/split/Clp/configure.ac

    r1527 r1530  
    6363AC_COIN_HAS_MODULE(Netlib,     [coindatanetlib], [required=0])
    6464
    65 # fallback if no pkg-config is available
     65# fallbacks if no pkg-config is available
    6666if test "$coin_has_coinutils" != yes ; then
    6767  AC_COIN_HAS_PROJECT(CoinUtils)
     
    7171  else
    7272    AC_MSG_ERROR("Required package CoinUtils unavailable.")
     73  fi
     74fi
     75
     76if 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`"
    7381  fi
    7482fi
  • branches/split/Clp/inc/config_clp.h.in

    r1527 r1530  
    1616#undef COIN_HAS_NETLIB
    1717
    18 /* Define to 1 if the Osi module is available */
     18/* Define to 1 if the Osi package is used */
    1919#undef COIN_HAS_OSI
    2020
  • branches/split/Clp/src/Makefile.in

    r1529 r1530  
    213213OPT_CFLAGS = @OPT_CFLAGS@
    214214OPT_CXXFLAGS = @OPT_CXXFLAGS@
     215OSIDOCDIR = @OSIDOCDIR@
     216OSIOBJDIR = @OSIOBJDIR@
     217OSISRCDIR = @OSISRCDIR@
    215218OSITESTS_CFLAGS = @OSITESTS_CFLAGS@
    216219OSITESTS_DATA = @OSITESTS_DATA@
  • branches/split/Clp/src/OsiClp/Makefile.in

    r1527 r1530  
    181181OPT_CFLAGS = @OPT_CFLAGS@
    182182OPT_CXXFLAGS = @OPT_CXXFLAGS@
     183OSIDOCDIR = @OSIDOCDIR@
     184OSIOBJDIR = @OSIOBJDIR@
     185OSISRCDIR = @OSISRCDIR@
    183186OSITESTS_CFLAGS = @OSITESTS_CFLAGS@
    184187OSITESTS_DATA = @OSITESTS_DATA@
  • branches/split/Clp/test/Makefile.in

    r1527 r1530  
    169169OPT_CFLAGS = @OPT_CFLAGS@
    170170OPT_CXXFLAGS = @OPT_CXXFLAGS@
     171OSIDOCDIR = @OSIDOCDIR@
     172OSIOBJDIR = @OSIOBJDIR@
     173OSISRCDIR = @OSISRCDIR@
    171174OSITESTS_CFLAGS = @OSITESTS_CFLAGS@
    172175OSITESTS_DATA = @OSITESTS_DATA@
Note: See TracChangeset for help on using the changeset viewer.