Changeset 1380

Timestamp:

Jul 7, 2009 12:47:06 PM (12 years ago)

Author:

andreasw

Message:

added --with-proj* configure options

Location:

stable/BSPsplit/Clp

Files:

• Makefile.in (modified) (1 diff)
• configure (modified) (28 diffs)
• configure.ac (modified) (1 diff)
• src/Makefile.am (modified) (2 diffs)
• src/Makefile.in (modified) (7 diffs)
• test/Makefile.in (modified) (1 diff)

stable/BSPsplit/Clp/Makefile.in

@@ -121 +121 @@
 CFLAGS = @CFLAGS@
 CLPDOCDIR = @CLPDOCDIR@
+CLPINSTDIR = @CLPINSTDIR@
 CLPOBJDIR = @CLPOBJDIR@
 CLPSRCDIR = @CLPSRCDIR@
 COINUTILSDOCDIR = @COINUTILSDOCDIR@
+COINUTILSINSTDIR = @COINUTILSINSTDIR@
 COINUTILSOBJDIR = @COINUTILSOBJDIR@
 COINUTILSSRCDIR = @COINUTILSSRCDIR@
 COIN_HAS_CLP_FALSE = @COIN_HAS_CLP_FALSE@
+COIN_HAS_CLP_INSTALLED_FALSE = @COIN_HAS_CLP_INSTALLED_FALSE@
+COIN_HAS_CLP_INSTALLED_TRUE = @COIN_HAS_CLP_INSTALLED_TRUE@
 COIN_HAS_CLP_TRUE = @COIN_HAS_CLP_TRUE@
 COIN_HAS_COINUTILS_FALSE = @COIN_HAS_COINUTILS_FALSE@
+COIN_HAS_COINUTILS_INSTALLED_FALSE = @COIN_HAS_COINUTILS_INSTALLED_FALSE@
+COIN_HAS_COINUTILS_INSTALLED_TRUE = @COIN_HAS_COINUTILS_INSTALLED_TRUE@
 COIN_HAS_COINUTILS_TRUE = @COIN_HAS_COINUTILS_TRUE@
 CPP = @CPP@

stable/BSPsplit/Clp/configure

@@ -473 +473 @@
 #endif"
 
-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 COINUTILSSRCDIR COINUTILSOBJDIR COINUTILSDOCDIR COIN_HAS_COINUTILS_TRUE COIN_HAS_COINUTILS_FALSE CLPSRCDIR CLPOBJDIR CLPDOCDIR COIN_HAS_CLP_TRUE COIN_HAS_CLP_FALSE LIBEXT VPATH_DISTCLEANFILES LIBOBJS LTLIBOBJS'
+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 COINUTILSSRCDIR COINUTILSOBJDIR COINUTILSDOCDIR COINUTILSINSTDIR COIN_HAS_COINUTILS_TRUE COIN_HAS_COINUTILS_FALSE COIN_HAS_COINUTILS_INSTALLED_TRUE COIN_HAS_COINUTILS_INSTALLED_FALSE CLPSRCDIR CLPOBJDIR CLPDOCDIR CLPINSTDIR COIN_HAS_CLP_TRUE COIN_HAS_CLP_FALSE COIN_HAS_CLP_INSTALLED_TRUE COIN_HAS_CLP_INSTALLED_FALSE LIBEXT VPATH_DISTCLEANFILES LIBOBJS LTLIBOBJS'
 ac_subst_files=''
 
@@ -1105 +1105 @@
   --with-tags[=TAGS]
                           include additional configurations [automatic]
+  --with-coinutils-instdir
+                          prefix of installation directory for precompiled
+                          CoinUtils package
+  --with-coinutils-srcdir source directory for CoinUtils package
+  --with-coinutils-objdir object directory for CoinUtils package (if different
+                          from source directory in VPATH compilation)
+  --with-coin-instdir     prefix of installation directory for precompiled
+                          COIN packages
+  --with-clp-instdir prefix of installation directory for precompiled Clp
+                          package
+  --with-clp-srcdir source directory for Clp package
+  --with-clp-objdir object directory for Clp package (if different from source
+                          directory in VPATH compilation)
   --with-wsmp             specify WSMP library
 
@@ -5779 +5792 @@
 *-*-irix6*)
   # Find out which ABI we are using.
-  echo '#line 5781 "configure"' > conftest.$ac_ext
+  echo '#line 5794 "configure"' > conftest.$ac_ext
   if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
@@ -6913 +6926 @@
 
 # Provide some information about the compiler.
-echo "$as_me:6915:" \
+echo "$as_me:6928:" \
      "checking for Fortran 77 compiler version" >&5
 ac_compiler=`set X $ac_compile; echo $2`
@@ -7980 +7993 @@
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:7982: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:7995: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:7986: \$? = $ac_status" >&5
+   echo "$as_me:7999: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
@@ -8248 +8261 @@
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:8250: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:8263: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:8254: \$? = $ac_status" >&5
+   echo "$as_me:8267: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
@@ -8352 +8365 @@
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:8354: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:8367: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:8358: \$? = $ac_status" >&5
+   echo "$as_me:8371: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
@@ -10697 +10710 @@
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 10699 "configure"
+#line 10712 "configure"
 #include "confdefs.h"
 
@@ -10797 +10810 @@
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 10799 "configure"
+#line 10812 "configure"
 #include "confdefs.h"
 
@@ -13141 +13154 @@
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:13143: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:13156: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:13147: \$? = $ac_status" >&5
+   echo "$as_me:13160: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
@@ -13245 +13258 @@
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:13247: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:13260: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:13251: \$? = $ac_status" >&5
+   echo "$as_me:13264: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
@@ -14815 +14828 @@
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:14817: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:14830: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:14821: \$? = $ac_status" >&5
+   echo "$as_me:14834: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
@@ -14919 +14932 @@
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:14921: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:14934: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:14925: \$? = $ac_status" >&5
+   echo "$as_me:14938: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
@@ -17126 +17139 @@
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:17128: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:17141: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:17132: \$? = $ac_status" >&5
+   echo "$as_me:17145: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
@@ -17394 +17407 @@
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:17396: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:17409: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:17400: \$? = $ac_status" >&5
+   echo "$as_me:17413: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
@@ -17498 +17511 @@
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:17500: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:17513: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:17504: \$? = $ac_status" >&5
+   echo "$as_me:17517: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
@@ -20397 +20410 @@
 # other locations)
 
-coin_has_coinutils=unavailable
+coin_has_coinutils=notGiven
 if test x"$COIN_SKIP_PROJECTS" != x; then
   for dir in $COIN_SKIP_PROJECTS; do
@@ -20406 +20419 @@
 fi
 
+
+
+
+
+COINUTILSSRCDIR=This_Variable_Is_Not_Set
+COINUTILSOBJDIR=This_Variable_Is_Not_Set
+COINUTILSDOCDIR=This_Variable_Is_Not_Set
+COINUTILSINSTDIR=This_Variable_Is_Not_Set
+
 if test $coin_has_coinutils != skipping; then
   if test $PACKAGE_TARNAME = coinutils; then
     coin_has_coinutils=.
   else
-    if test -d $srcdir/../CoinUtils; then
-      coin_has_coinutils=../CoinUtils
+
+# Check whether --with-m4_tolower(CoinUtils)-instdir or --without-m4_tolower(CoinUtils)-instdir was given.
+if test "${with_coinutils_instdir+set}" = set; then
+  withval="$with_coinutils_instdir"
+  coin_has_coinutils=installed
+                 if test -d "$withval"; then : ; else
+                   { { echo "$as_me:$LINENO: error: argument for --with-coinutils-instdir not a directory" >&5
+echo "$as_me: error: argument for --with-coinutils-instdir not a directory" >&2;}
+   { (exit 1); exit 1; }; }
+                 fi
+                 COINUTILSINSTDIR=`cd $withval; pwd`
+fi;
+
+
+# Check whether --with-m4_tolower(CoinUtils)-srcdir or --without-m4_tolower(CoinUtils)-srcdir was given.
+if test "${with_coinutils_srcdir+set}" = set; then
+  withval="$with_coinutils_srcdir"
+  if test "$coin_has_coinutils" = installed; then
+                   { { echo "$as_me:$LINENO: error: --with-$coinutils-srcdir cannot be given together with --with-coinutils-instdir" >&5
+echo "$as_me: error: --with-$coinutils-srcdir cannot be given together with --with-coinutils-instdir" >&2;}
+   { (exit 1); exit 1; }; }
+                 fi
+                 if test -d "$withval"; then : ; else
+                   { { echo "$as_me:$LINENO: error: argument for --with-coinutils-srcdir not a directory" >&5
+echo "$as_me: error: argument for --with-coinutils-srcdir not a directory" >&2;}
+   { (exit 1); exit 1; }; }
+                 fi
+                 coin_has_coinutils=$withval
+                 COINUTILSSRCDIR=`cd $withval; pwd`
+fi;
+
+
+# Check whether --with-m4_tolower(CoinUtils)-objdir or --without-m4_tolower(CoinUtils)-objdir was given.
+if test "${with_coinutils_objdir+set}" = set; then
+  withval="$with_coinutils_objdir"
+  if test "$coin_has_coinutils" = installed; then
+                   { { echo "$as_me:$LINENO: error: --with-coinutils-objdir cannot be given together with --with-coinutils-instdir" >&5
+echo "$as_me: error: --with-coinutils-objdir cannot be given together with --with-coinutils-instdir" >&2;}
+   { (exit 1); exit 1; }; }
+                 fi
+                 if test "$coin_has_coinutils" = notGiven; then
+                   { { echo "$as_me:$LINENO: error: --with-coinutils-objdir must be accompanied by --with-coinutils-srcdir" >&5
+echo "$as_me: error: --with-coinutils-objdir must be accompanied by --with-coinutils-srcdir" >&2;}
+   { (exit 1); exit 1; }; }
+                 fi
+                 if test -d "$withval"; then : ; else
+                   { { echo "$as_me:$LINENO: error: argument for --with-coinutils-objdir not a directory" >&5
+echo "$as_me: error: argument for --with-coinutils-objdir not a directory" >&2;}
+   { (exit 1); exit 1; }; }
+                 fi
+                 COINUTILSOBJDIR=`cd $withval; pwd`
+else
+  COINUTILSOBJDIR="$COINUTILSSRCDIR"
+fi;
+
+    # if we still don't have a location, check for generic flag
+    if test "$coin_has_coinutils" = notGiven; then
+
+# Check whether --with-coin-instdir or --without-coin-instdir was given.
+if test "${with_coin_instdir+set}" = set; then
+  withval="$with_coin_instdir"
+  coin_has_coinutils=installed
+                   if test -d "$withval"; then : ; else
+                     { { echo "$as_me:$LINENO: error: argument for --with-coin-instdir not a directory" >&5
+echo "$as_me: error: argument for --with-coin-instdir not a directory" >&2;}
+   { (exit 1); exit 1; }; }
+                   fi
+                   COINUTILSINSTDIR=`cd $withval; pwd`
+fi;
+    fi
+
+    if test "$coin_has_coinutils" = notGiven; then
+      if test -d $srcdir/../CoinUtils; then
+        coin_has_coinutils=../CoinUtils
+      fi
     fi
   fi
 fi
 
-if test $coin_has_coinutils != unavailable &&
+if test $coin_has_coinutils != notGiven &&
    test $coin_has_coinutils != skipping; then
   # Set the #define if the component is available
@@ -20425 +20520 @@
 
 
-  # Set the variables for source and object code location
-
-  COINUTILSSRCDIR=`cd $srcdir/$coin_has_coinutils; pwd`
-
-  COINUTILSOBJDIR=`pwd`/$coin_has_coinutils
-
-  COINUTILSDOCDIR=$abs_lib_dir/../share/doc/coin/CoinUtils
+  if test $coin_has_coinutils = installed; then
+    COINUTILSDOCDIR=$COINUTILSINSTDIR/share/doc/coin/CoinUtils
+  else
+    if test "$COINUTILSOBJDIR" = This_Variable_Is_Not_Set; then
+      # Set the variables for source and object code location
+      COINUTILSSRCDIR=`cd $srcdir/$coin_has_coinutils; pwd`
+      COINUTILSOBJDIR=`pwd`/$coin_has_coinutils
+      COINUTILSDOCDIR=$abs_lib_dir/../share/doc/coin/CoinUtils
+    else
+      # This is just a guess:
+      COINUTILSDOCDIR=$COINUTILSOBJDIR/../share/doc/coin/CoinUtils
+    fi
+  fi
 fi
 
@@ -20437 +20538 @@
 
 
-if test $coin_has_coinutils != unavailable &&
+if test $coin_has_coinutils != notGiven &&
                 test $coin_has_coinutils != skipping; then
   COIN_HAS_COINUTILS_TRUE=
@@ -20446 +20547 @@
 fi
 
-echo "$as_me:$LINENO: result: $coin_has_coinutils" >&5
+
+
+if test $coin_has_coinutils = installed; then
+  COIN_HAS_COINUTILS_INSTALLED_TRUE=
+  COIN_HAS_COINUTILS_INSTALLED_FALSE='#'
+else
+  COIN_HAS_COINUTILS_INSTALLED_TRUE='#'
+  COIN_HAS_COINUTILS_INSTALLED_FALSE=
+fi
+
+
+if test $coin_has_coinutils = installed; then
+  echo "$as_me:$LINENO: result: installed in $COINUTILSINSTDIR" >&5
+echo "${ECHO_T}installed in $COINUTILSINSTDIR" >&6
+  # Check for header
+  tmp=$COINUTILSINSTDIR/include/coin
+                  echo "$as_me:$LINENO: checking whether header CoinTime.hpp is available in $tmp" >&5
+echo $ECHO_N "checking whether header CoinTime.hpp is available in $tmp... $ECHO_C" >&6
+                  if test -r $tmp/CoinTime.hpp; then
+                    echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6
+                  else
+                    echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
+                    { { echo "$as_me:$LINENO: error: Header CoinTime.hpp not available in CoinUtils installation directory" >&5
+echo "$as_me: error: Header CoinTime.hpp not available in CoinUtils installation directory" >&2;}
+   { (exit 1); exit 1; }; }
+                  fi
+
+  # Check for library (this is not qo reliable)
+  tmp=$COINUTILSINSTDIR/lib
+                  echo "$as_me:$LINENO: checking whether library libCoinUtils.* is available in $tmp" >&5
+echo $ECHO_N "checking whether library libCoinUtils.* is available in $tmp... $ECHO_C" >&6
+                  bla=`ls $tmp/libCoinUtils.* 2>/dev/null | head -n 1`
+                  if test x"$bla" = x; then
+                    echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
+                    { { echo "$as_me:$LINENO: error: Library libCoinUtils.* not available in CoinUtils installation directory" >&5
+echo "$as_me: error: Library libCoinUtils.* not available in CoinUtils installation directory" >&2;}
+   { (exit 1); exit 1; }; }
+                  else
+                    echo "$as_me:$LINENO: result: found $bla" >&5
+echo "${ECHO_T}found $bla" >&6
+                  fi
+
+else
+  echo "$as_me:$LINENO: result: $coin_has_coinutils" >&5
 echo "${ECHO_T}$coin_has_coinutils" >&6
+fi
 
 echo "$as_me:$LINENO: checking for COIN project Clp" >&5
@@ -20455 +20603 @@
 # other locations)
 
-coin_has_clp=unavailable
+coin_has_clp=notGiven
 if test x"$COIN_SKIP_PROJECTS" != x; then
   for dir in $COIN_SKIP_PROJECTS; do
@@ -20464 +20612 @@
 fi
 
+
+
+
+
+CLPSRCDIR=This_Variable_Is_Not_Set
+CLPOBJDIR=This_Variable_Is_Not_Set
+CLPDOCDIR=This_Variable_Is_Not_Set
+CLPINSTDIR=This_Variable_Is_Not_Set
+
 if test $coin_has_clp != skipping; then
   if test $PACKAGE_TARNAME = clp; then
     coin_has_clp=.
   else
-    if test -d $srcdir/../Clp; then
-      coin_has_clp=../Clp
+
+# Check whether --with-m4_tolower(Clp)-instdir or --without-m4_tolower(Clp)-instdir was given.
+if test "${with_clp_instdir+set}" = set; then
+  withval="$with_clp_instdir"
+  coin_has_clp=installed
+                 if test -d "$withval"; then : ; else
+                   { { echo "$as_me:$LINENO: error: argument for --with-clp-instdir not a directory" >&5
+echo "$as_me: error: argument for --with-clp-instdir not a directory" >&2;}
+   { (exit 1); exit 1; }; }
+                 fi
+                 CLPINSTDIR=`cd $withval; pwd`
+fi;
+
+
+# Check whether --with-m4_tolower(Clp)-srcdir or --without-m4_tolower(Clp)-srcdir was given.
+if test "${with_clp_srcdir+set}" = set; then
+  withval="$with_clp_srcdir"
+  if test "$coin_has_clp" = installed; then
+                   { { echo "$as_me:$LINENO: error: --with-$clp-srcdir cannot be given together with --with-clp-instdir" >&5
+echo "$as_me: error: --with-$clp-srcdir cannot be given together with --with-clp-instdir" >&2;}
+   { (exit 1); exit 1; }; }
+                 fi
+                 if test -d "$withval"; then : ; else
+                   { { echo "$as_me:$LINENO: error: argument for --with-clp-srcdir not a directory" >&5
+echo "$as_me: error: argument for --with-clp-srcdir not a directory" >&2;}
+   { (exit 1); exit 1; }; }
+                 fi
+                 coin_has_clp=$withval
+                 CLPSRCDIR=`cd $withval; pwd`
+fi;
+
+
+# Check whether --with-m4_tolower(Clp)-objdir or --without-m4_tolower(Clp)-objdir was given.
+if test "${with_clp_objdir+set}" = set; then
+  withval="$with_clp_objdir"
+  if test "$coin_has_clp" = installed; then
+                   { { echo "$as_me:$LINENO: error: --with-clp-objdir cannot be given together with --with-clp-instdir" >&5
+echo "$as_me: error: --with-clp-objdir cannot be given together with --with-clp-instdir" >&2;}
+   { (exit 1); exit 1; }; }
+                 fi
+                 if test "$coin_has_clp" = notGiven; then
+                   { { echo "$as_me:$LINENO: error: --with-clp-objdir must be accompanied by --with-clp-srcdir" >&5
+echo "$as_me: error: --with-clp-objdir must be accompanied by --with-clp-srcdir" >&2;}
+   { (exit 1); exit 1; }; }
+                 fi
+                 if test -d "$withval"; then : ; else
+                   { { echo "$as_me:$LINENO: error: argument for --with-clp-objdir not a directory" >&5
+echo "$as_me: error: argument for --with-clp-objdir not a directory" >&2;}
+   { (exit 1); exit 1; }; }
+                 fi
+                 CLPOBJDIR=`cd $withval; pwd`
+else
+  CLPOBJDIR="$CLPSRCDIR"
+fi;
+
+    # if we still don't have a location, check for generic flag
+    if test "$coin_has_clp" = notGiven; then
+
+# Check whether --with-coin-instdir or --without-coin-instdir was given.
+if test "${with_coin_instdir+set}" = set; then
+  withval="$with_coin_instdir"
+  coin_has_clp=installed
+                   if test -d "$withval"; then : ; else
+                     { { echo "$as_me:$LINENO: error: argument for --with-coin-instdir not a directory" >&5
+echo "$as_me: error: argument for --with-coin-instdir not a directory" >&2;}
+   { (exit 1); exit 1; }; }
+                   fi
+                   CLPINSTDIR=`cd $withval; pwd`
+fi;
+    fi
+
+    if test "$coin_has_clp" = notGiven; then
+      if test -d $srcdir/../Clp; then
+        coin_has_clp=../Clp
+      fi
     fi
   fi
 fi
 
-if test $coin_has_clp != unavailable &&
+if test $coin_has_clp != notGiven &&
    test $coin_has_clp != skipping; then
   # Set the #define if the component is available
@@ -20483 +20713 @@
 
 
-  # Set the variables for source and object code location
-
-  CLPSRCDIR=`cd $srcdir/$coin_has_clp; pwd`
-
-  CLPOBJDIR=`pwd`/$coin_has_clp
-
-  CLPDOCDIR=$abs_lib_dir/../share/doc/coin/Clp
+  if test $coin_has_clp = installed; then
+    CLPDOCDIR=$CLPINSTDIR/share/doc/coin/Clp
+  else
+    if test "$CLPOBJDIR" = This_Variable_Is_Not_Set; then
+      # Set the variables for source and object code location
+      CLPSRCDIR=`cd $srcdir/$coin_has_clp; pwd`
+      CLPOBJDIR=`pwd`/$coin_has_clp
+      CLPDOCDIR=$abs_lib_dir/../share/doc/coin/Clp
+    else
+      # This is just a guess:
+      CLPDOCDIR=$CLPOBJDIR/../share/doc/coin/Clp
+    fi
+  fi
 fi
 
@@ -20495 +20731 @@
 
 
-if test $coin_has_clp != unavailable &&
+if test $coin_has_clp != notGiven &&
                 test $coin_has_clp != skipping; then
   COIN_HAS_CLP_TRUE=
@@ -20504 +20740 @@
 fi
 
-echo "$as_me:$LINENO: result: $coin_has_clp" >&5
+
+
+if test $coin_has_clp = installed; then
+  COIN_HAS_CLP_INSTALLED_TRUE=
+  COIN_HAS_CLP_INSTALLED_FALSE='#'
+else
+  COIN_HAS_CLP_INSTALLED_TRUE='#'
+  COIN_HAS_CLP_INSTALLED_FALSE=
+fi
+
+
+if test $coin_has_clp = installed; then
+  echo "$as_me:$LINENO: result: installed in $CLPINSTDIR" >&5
+echo "${ECHO_T}installed in $CLPINSTDIR" >&6
+  # Check for header
+
+  # Check for library (this is not qo reliable)
+
+else
+  echo "$as_me:$LINENO: result: $coin_has_clp" >&5
 echo "${ECHO_T}$coin_has_clp" >&6
+fi
 
 
@@ -21192 +21448 @@
    { (exit 1); exit 1; }; }
 fi
+if test -z "${COIN_HAS_COINUTILS_INSTALLED_TRUE}" && test -z "${COIN_HAS_COINUTILS_INSTALLED_FALSE}"; then
+  { { echo "$as_me:$LINENO: error: conditional \"COIN_HAS_COINUTILS_INSTALLED\" was never defined.
+Usually this means the macro was only invoked conditionally." >&5
+echo "$as_me: error: conditional \"COIN_HAS_COINUTILS_INSTALLED\" was never defined.
+Usually this means the macro was only invoked conditionally." >&2;}
+   { (exit 1); exit 1; }; }
+fi
 if test -z "${COIN_HAS_CLP_TRUE}" && test -z "${COIN_HAS_CLP_FALSE}"; then
   { { echo "$as_me:$LINENO: error: conditional \"COIN_HAS_CLP\" was never defined.
 Usually this means the macro was only invoked conditionally." >&5
 echo "$as_me: error: conditional \"COIN_HAS_CLP\" was never defined.
+Usually this means the macro was only invoked conditionally." >&2;}
+   { (exit 1); exit 1; }; }
+fi
+if test -z "${COIN_HAS_CLP_INSTALLED_TRUE}" && test -z "${COIN_HAS_CLP_INSTALLED_FALSE}"; then
+  { { echo "$as_me:$LINENO: error: conditional \"COIN_HAS_CLP_INSTALLED\" was never defined.
+Usually this means the macro was only invoked conditionally." >&5
+echo "$as_me: error: conditional \"COIN_HAS_CLP_INSTALLED\" was never defined.
 Usually this means the macro was only invoked conditionally." >&2;}
    { (exit 1); exit 1; }; }
@@ -21837 +22107 @@
 s,@COINUTILSOBJDIR@,$COINUTILSOBJDIR,;t t
 s,@COINUTILSDOCDIR@,$COINUTILSDOCDIR,;t t
+s,@COINUTILSINSTDIR@,$COINUTILSINSTDIR,;t t
 s,@COIN_HAS_COINUTILS_TRUE@,$COIN_HAS_COINUTILS_TRUE,;t t
 s,@COIN_HAS_COINUTILS_FALSE@,$COIN_HAS_COINUTILS_FALSE,;t t
+s,@COIN_HAS_COINUTILS_INSTALLED_TRUE@,$COIN_HAS_COINUTILS_INSTALLED_TRUE,;t t
+s,@COIN_HAS_COINUTILS_INSTALLED_FALSE@,$COIN_HAS_COINUTILS_INSTALLED_FALSE,;t t
 s,@CLPSRCDIR@,$CLPSRCDIR,;t t
 s,@CLPOBJDIR@,$CLPOBJDIR,;t t
 s,@CLPDOCDIR@,$CLPDOCDIR,;t t
+s,@CLPINSTDIR@,$CLPINSTDIR,;t t
 s,@COIN_HAS_CLP_TRUE@,$COIN_HAS_CLP_TRUE,;t t
 s,@COIN_HAS_CLP_FALSE@,$COIN_HAS_CLP_FALSE,;t t
+s,@COIN_HAS_CLP_INSTALLED_TRUE@,$COIN_HAS_CLP_INSTALLED_TRUE,;t t
+s,@COIN_HAS_CLP_INSTALLED_FALSE@,$COIN_HAS_CLP_INSTALLED_FALSE,;t t
 s,@LIBEXT@,$LIBEXT,;t t
 s,@VPATH_DISTCLEANFILES@,$VPATH_DISTCLEANFILES,;t t

stable/BSPsplit/Clp/configure.ac

@@ -57 +57 @@
 #############################################################################
 
-AC_COIN_HAS_PROJECT(CoinUtils)
+AC_COIN_HAS_PROJECT(CoinUtils, CoinTime.hpp, libCoinUtils)
 AC_COIN_HAS_PROJECT(Clp)
 

stable/BSPsplit/Clp/src/Makefile.am

@@ -92 +92 @@
 
 # List all additionally required COIN libraries
-clp_LDADD = libClp.la \
-        $(COINUTILSOBJDIR)/src/libCoinUtils.la
+clp_LDADD = libClp.la
+if COIN_HAS_COINUTILS_INSTALLED
+  clp_LDADD += -L$(COINUTILSINSTDIR)/lib -lCoinUtils
+else
+  clp_LDADD += $(COINUTILSOBJDIR)/src/libCoinUtils.la
+endif
 
 # Here we add additional libraries
-LIBS += $(ADDLIBS) `cat $(COINUTILSOBJDIR)/coinutils_addlibs.txt`
+LIBS += $(ADDLIBS)
+if COIN_HAS_COINUTILS_INSTALLED
+  LIBS += `cat $(COINUTILSDOCDIR)/coinutils_addlibs.txt`
+else
+  LIBS += `cat $(COINUTILSOBJDIR)/coinutils_addlibs.txt`
+endif
 
 # Finally, the -rpath flag is used by libtool to make sure that the shared
@@ -109 +118 @@
 # Here list all include flags, relative to this "srcdir" directory.  This
 # "cygpath" stuff is necessary to compile with native compilers on Windows.
-AM_CPPFLAGS = \
+if COIN_HAS_COINUTILS_INSTALLED
+  AM_CPPFLAGS = -I`$(CYGPATH_W) $(COINUTILSINSTDIR)/include/coin`
+else
+  AM_CPPFLAGS = \
         -I`$(CYGPATH_W) $(COINUTILSSRCDIR)/src` \
         -I`$(CYGPATH_W) $(COINUTILSOBJDIR)/inc`
+endif
 
 # This line is necessary to allow VPATH compilation with MS compilers

stable/BSPsplit/Clp/src/Makefile.in

@@ -46 +46 @@
 host_triplet = @host@
 bin_PROGRAMS = clp$(EXEEXT)
+@COIN_HAS_COINUTILS_INSTALLED_TRUE@am__append_1 = -L$(COINUTILSINSTDIR)/lib -lCoinUtils
+@COIN_HAS_COINUTILS_INSTALLED_FALSE@am__append_2 = $(COINUTILSOBJDIR)/src/libCoinUtils.la
+@COIN_HAS_COINUTILS_INSTALLED_TRUE@am__append_3 = `cat $(COINUTILSDOCDIR)/coinutils_addlibs.txt`
+@COIN_HAS_COINUTILS_INSTALLED_FALSE@am__append_4 = `cat $(COINUTILSOBJDIR)/coinutils_addlibs.txt`
 subdir = src
 DIST_COMMON = $(includecoin_HEADERS) $(srcdir)/Makefile.am \
@@ -93 +97 @@
         unitTest.$(OBJEXT)
 clp_OBJECTS = $(am_clp_OBJECTS)
-clp_DEPENDENCIES = libClp.la $(COINUTILSOBJDIR)/src/libCoinUtils.la
+am__DEPENDENCIES_1 =
+@COIN_HAS_COINUTILS_INSTALLED_FALSE@am__DEPENDENCIES_2 = $(COINUTILSOBJDIR)/src/libCoinUtils.la
+clp_DEPENDENCIES = libClp.la $(am__DEPENDENCIES_1) \
+        $(am__DEPENDENCIES_2)
 depcomp = $(SHELL) $(top_srcdir)/../depcomp
 am__depfiles_maybe = depfiles
@@ -140 +147 @@
 CFLAGS = @CFLAGS@
 CLPDOCDIR = @CLPDOCDIR@
+CLPINSTDIR = @CLPINSTDIR@
 CLPOBJDIR = @CLPOBJDIR@
 CLPSRCDIR = @CLPSRCDIR@
 COINUTILSDOCDIR = @COINUTILSDOCDIR@
+COINUTILSINSTDIR = @COINUTILSINSTDIR@
 COINUTILSOBJDIR = @COINUTILSOBJDIR@
 COINUTILSSRCDIR = @COINUTILSSRCDIR@
 COIN_HAS_CLP_FALSE = @COIN_HAS_CLP_FALSE@
+COIN_HAS_CLP_INSTALLED_FALSE = @COIN_HAS_CLP_INSTALLED_FALSE@
+COIN_HAS_CLP_INSTALLED_TRUE = @COIN_HAS_CLP_INSTALLED_TRUE@
 COIN_HAS_CLP_TRUE = @COIN_HAS_CLP_TRUE@
 COIN_HAS_COINUTILS_FALSE = @COIN_HAS_COINUTILS_FALSE@
+COIN_HAS_COINUTILS_INSTALLED_FALSE = @COIN_HAS_COINUTILS_INSTALLED_FALSE@
+COIN_HAS_COINUTILS_INSTALLED_TRUE = @COIN_HAS_COINUTILS_INSTALLED_TRUE@
 COIN_HAS_COINUTILS_TRUE = @COIN_HAS_COINUTILS_TRUE@
 CPP = @CPP@
@@ -181 +194 @@
 
 # Here we add additional libraries
-LIBS = @LIBS@ $(ADDLIBS) `cat \
-        $(COINUTILSOBJDIR)/coinutils_addlibs.txt`
+LIBS = @LIBS@ $(ADDLIBS) $(am__append_3) $(am__append_4)
 LIBTOOL = @LIBTOOL@
 LIBTOOLM4 = @LIBTOOLM4@
@@ -343 +355 @@
 
 # List all additionally required COIN libraries
-clp_LDADD = libClp.la \
-        $(COINUTILSOBJDIR)/src/libCoinUtils.la
-
+clp_LDADD = libClp.la $(am__append_1) $(am__append_2)
 
 # Finally, the -rpath flag is used by libtool to make sure that the shared
@@ -351 +361 @@
 # libraries.
 clp_LDFLAGS = -rpath $(libdir)
+@COIN_HAS_COINUTILS_INSTALLED_FALSE@AM_CPPFLAGS = \
+@COIN_HAS_COINUTILS_INSTALLED_FALSE@    -I`$(CYGPATH_W) $(COINUTILSSRCDIR)/src` \
+@COIN_HAS_COINUTILS_INSTALLED_FALSE@    -I`$(CYGPATH_W) $(COINUTILSOBJDIR)/inc`
+
 
 ########################################################################
@@ -358 +372 @@
 # Here list all include flags, relative to this "srcdir" directory.  This
 # "cygpath" stuff is necessary to compile with native compilers on Windows.
-AM_CPPFLAGS = \
-        -I`$(CYGPATH_W) $(COINUTILSSRCDIR)/src` \
-        -I`$(CYGPATH_W) $(COINUTILSOBJDIR)/inc`
-
+@COIN_HAS_COINUTILS_INSTALLED_TRUE@AM_CPPFLAGS = -I`$(CYGPATH_W) $(COINUTILSINSTDIR)/include/coin`
 
 # This line is necessary to allow VPATH compilation with MS compilers

stable/BSPsplit/Clp/test/Makefile.in

@@ -76 +76 @@
 CFLAGS = @CFLAGS@
 CLPDOCDIR = @CLPDOCDIR@
+CLPINSTDIR = @CLPINSTDIR@
 CLPOBJDIR = @CLPOBJDIR@
 CLPSRCDIR = @CLPSRCDIR@
 COINUTILSDOCDIR = @COINUTILSDOCDIR@
+COINUTILSINSTDIR = @COINUTILSINSTDIR@
 COINUTILSOBJDIR = @COINUTILSOBJDIR@
 COINUTILSSRCDIR = @COINUTILSSRCDIR@
 COIN_HAS_CLP_FALSE = @COIN_HAS_CLP_FALSE@
+COIN_HAS_CLP_INSTALLED_FALSE = @COIN_HAS_CLP_INSTALLED_FALSE@
+COIN_HAS_CLP_INSTALLED_TRUE = @COIN_HAS_CLP_INSTALLED_TRUE@
 COIN_HAS_CLP_TRUE = @COIN_HAS_CLP_TRUE@
 COIN_HAS_COINUTILS_FALSE = @COIN_HAS_COINUTILS_FALSE@
+COIN_HAS_COINUTILS_INSTALLED_FALSE = @COIN_HAS_COINUTILS_INSTALLED_FALSE@
+COIN_HAS_COINUTILS_INSTALLED_TRUE = @COIN_HAS_COINUTILS_INSTALLED_TRUE@
 COIN_HAS_COINUTILS_TRUE = @COIN_HAS_COINUTILS_TRUE@
 CPP = @CPP@