Changeset 1381 for stable


Ignore:
Timestamp:
Jul 7, 2009 4:23:43 PM (10 years ago)
Author:
andreasw
Message:

more --with-proj-instdir changes

Location:
stable/BSPsplit/Clp
Files:
5 edited

Legend:

Unmodified
Added
Removed
  • stable/BSPsplit/Clp/Makefile.in

    r1380 r1381  
    129129COINUTILSSRCDIR = @COINUTILSSRCDIR@
    130130COIN_HAS_CLP_FALSE = @COIN_HAS_CLP_FALSE@
    131 COIN_HAS_CLP_INSTALLED_FALSE = @COIN_HAS_CLP_INSTALLED_FALSE@
    132 COIN_HAS_CLP_INSTALLED_TRUE = @COIN_HAS_CLP_INSTALLED_TRUE@
     131COIN_HAS_CLP_PREINSTALLED_FALSE = @COIN_HAS_CLP_PREINSTALLED_FALSE@
     132COIN_HAS_CLP_PREINSTALLED_TRUE = @COIN_HAS_CLP_PREINSTALLED_TRUE@
    133133COIN_HAS_CLP_TRUE = @COIN_HAS_CLP_TRUE@
    134134COIN_HAS_COINUTILS_FALSE = @COIN_HAS_COINUTILS_FALSE@
    135 COIN_HAS_COINUTILS_INSTALLED_FALSE = @COIN_HAS_COINUTILS_INSTALLED_FALSE@
    136 COIN_HAS_COINUTILS_INSTALLED_TRUE = @COIN_HAS_COINUTILS_INSTALLED_TRUE@
     135COIN_HAS_COINUTILS_PREINSTALLED_FALSE = @COIN_HAS_COINUTILS_PREINSTALLED_FALSE@
     136COIN_HAS_COINUTILS_PREINSTALLED_TRUE = @COIN_HAS_COINUTILS_PREINSTALLED_TRUE@
    137137COIN_HAS_COINUTILS_TRUE = @COIN_HAS_COINUTILS_TRUE@
    138138CPP = @CPP@
  • stable/BSPsplit/Clp/configure

    r1380 r1381  
    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 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'
     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 COINUTILSSRCDIR COINUTILSOBJDIR COINUTILSDOCDIR COINUTILSINSTDIR COIN_HAS_COINUTILS_TRUE COIN_HAS_COINUTILS_FALSE COIN_HAS_COINUTILS_PREINSTALLED_TRUE COIN_HAS_COINUTILS_PREINSTALLED_FALSE CLPSRCDIR CLPOBJDIR CLPDOCDIR CLPINSTDIR COIN_HAS_CLP_TRUE COIN_HAS_CLP_FALSE COIN_HAS_CLP_PREINSTALLED_TRUE COIN_HAS_CLP_PREINSTALLED_FALSE LIBEXT VPATH_DISTCLEANFILES LIBOBJS LTLIBOBJS'
    476476ac_subst_files=''
    477477
     
    2055020550
    2055120551if test $coin_has_coinutils = installed; then
    20552   COIN_HAS_COINUTILS_INSTALLED_TRUE=
    20553   COIN_HAS_COINUTILS_INSTALLED_FALSE='#'
    20554 else
    20555   COIN_HAS_COINUTILS_INSTALLED_TRUE='#'
    20556   COIN_HAS_COINUTILS_INSTALLED_FALSE=
     20552  COIN_HAS_COINUTILS_PREINSTALLED_TRUE=
     20553  COIN_HAS_COINUTILS_PREINSTALLED_FALSE='#'
     20554else
     20555  COIN_HAS_COINUTILS_PREINSTALLED_TRUE='#'
     20556  COIN_HAS_COINUTILS_PREINSTALLED_FALSE=
    2055720557fi
    2055820558
     
    2074320743
    2074420744if test $coin_has_clp = installed; then
    20745   COIN_HAS_CLP_INSTALLED_TRUE=
    20746   COIN_HAS_CLP_INSTALLED_FALSE='#'
    20747 else
    20748   COIN_HAS_CLP_INSTALLED_TRUE='#'
    20749   COIN_HAS_CLP_INSTALLED_FALSE=
     20745  COIN_HAS_CLP_PREINSTALLED_TRUE=
     20746  COIN_HAS_CLP_PREINSTALLED_FALSE='#'
     20747else
     20748  COIN_HAS_CLP_PREINSTALLED_TRUE='#'
     20749  COIN_HAS_CLP_PREINSTALLED_FALSE=
    2075020750fi
    2075120751
     
    2144821448   { (exit 1); exit 1; }; }
    2144921449fi
    21450 if test -z "${COIN_HAS_COINUTILS_INSTALLED_TRUE}" && test -z "${COIN_HAS_COINUTILS_INSTALLED_FALSE}"; then
    21451   { { echo "$as_me:$LINENO: error: conditional \"COIN_HAS_COINUTILS_INSTALLED\" was never defined.
     21450if test -z "${COIN_HAS_COINUTILS_PREINSTALLED_TRUE}" && test -z "${COIN_HAS_COINUTILS_PREINSTALLED_FALSE}"; then
     21451  { { echo "$as_me:$LINENO: error: conditional \"COIN_HAS_COINUTILS_PREINSTALLED\" was never defined.
    2145221452Usually this means the macro was only invoked conditionally." >&5
    21453 echo "$as_me: error: conditional \"COIN_HAS_COINUTILS_INSTALLED\" was never defined.
     21453echo "$as_me: error: conditional \"COIN_HAS_COINUTILS_PREINSTALLED\" was never defined.
    2145421454Usually this means the macro was only invoked conditionally." >&2;}
    2145521455   { (exit 1); exit 1; }; }
     
    2146221462   { (exit 1); exit 1; }; }
    2146321463fi
    21464 if test -z "${COIN_HAS_CLP_INSTALLED_TRUE}" && test -z "${COIN_HAS_CLP_INSTALLED_FALSE}"; then
    21465   { { echo "$as_me:$LINENO: error: conditional \"COIN_HAS_CLP_INSTALLED\" was never defined.
     21464if test -z "${COIN_HAS_CLP_PREINSTALLED_TRUE}" && test -z "${COIN_HAS_CLP_PREINSTALLED_FALSE}"; then
     21465  { { echo "$as_me:$LINENO: error: conditional \"COIN_HAS_CLP_PREINSTALLED\" was never defined.
    2146621466Usually this means the macro was only invoked conditionally." >&5
    21467 echo "$as_me: error: conditional \"COIN_HAS_CLP_INSTALLED\" was never defined.
     21467echo "$as_me: error: conditional \"COIN_HAS_CLP_PREINSTALLED\" was never defined.
    2146821468Usually this means the macro was only invoked conditionally." >&2;}
    2146921469   { (exit 1); exit 1; }; }
     
    2211022110s,@COIN_HAS_COINUTILS_TRUE@,$COIN_HAS_COINUTILS_TRUE,;t t
    2211122111s,@COIN_HAS_COINUTILS_FALSE@,$COIN_HAS_COINUTILS_FALSE,;t t
    22112 s,@COIN_HAS_COINUTILS_INSTALLED_TRUE@,$COIN_HAS_COINUTILS_INSTALLED_TRUE,;t t
    22113 s,@COIN_HAS_COINUTILS_INSTALLED_FALSE@,$COIN_HAS_COINUTILS_INSTALLED_FALSE,;t t
     22112s,@COIN_HAS_COINUTILS_PREINSTALLED_TRUE@,$COIN_HAS_COINUTILS_PREINSTALLED_TRUE,;t t
     22113s,@COIN_HAS_COINUTILS_PREINSTALLED_FALSE@,$COIN_HAS_COINUTILS_PREINSTALLED_FALSE,;t t
    2211422114s,@CLPSRCDIR@,$CLPSRCDIR,;t t
    2211522115s,@CLPOBJDIR@,$CLPOBJDIR,;t t
     
    2211822118s,@COIN_HAS_CLP_TRUE@,$COIN_HAS_CLP_TRUE,;t t
    2211922119s,@COIN_HAS_CLP_FALSE@,$COIN_HAS_CLP_FALSE,;t t
    22120 s,@COIN_HAS_CLP_INSTALLED_TRUE@,$COIN_HAS_CLP_INSTALLED_TRUE,;t t
    22121 s,@COIN_HAS_CLP_INSTALLED_FALSE@,$COIN_HAS_CLP_INSTALLED_FALSE,;t t
     22120s,@COIN_HAS_CLP_PREINSTALLED_TRUE@,$COIN_HAS_CLP_PREINSTALLED_TRUE,;t t
     22121s,@COIN_HAS_CLP_PREINSTALLED_FALSE@,$COIN_HAS_CLP_PREINSTALLED_FALSE,;t t
    2212222122s,@LIBEXT@,$LIBEXT,;t t
    2212322123s,@VPATH_DISTCLEANFILES@,$VPATH_DISTCLEANFILES,;t t
  • stable/BSPsplit/Clp/src/Makefile.am

    r1380 r1381  
    1 # Copyright (C) 2006 International Business Machines and others.
     1# Copyright (C) 2006, 2009 International Business Machines and others.
    22# All Rights Reserved.
    33# This file is distributed under the Common Public License.
     
    9393# List all additionally required COIN libraries
    9494clp_LDADD = libClp.la
    95 if COIN_HAS_COINUTILS_INSTALLED
    96   clp_LDADD += -L$(COINUTILSINSTDIR)/lib -lCoinUtils
     95if COIN_HAS_COINUTILS_PREINSTALLED
     96  LIBS += -L`$(CYGPATH_W) $(COINUTILSINSTDIR)/lib` -lCoinUtils
    9797else
    9898  clp_LDADD += $(COINUTILSOBJDIR)/src/libCoinUtils.la
     
    101101# Here we add additional libraries
    102102LIBS += $(ADDLIBS)
    103 if COIN_HAS_COINUTILS_INSTALLED
     103if COIN_HAS_COINUTILS_PREINSTALLED
    104104  LIBS += `cat $(COINUTILSDOCDIR)/coinutils_addlibs.txt`
    105105else
     
    118118# Here list all include flags, relative to this "srcdir" directory.  This
    119119# "cygpath" stuff is necessary to compile with native compilers on Windows.
    120 if COIN_HAS_COINUTILS_INSTALLED
     120if COIN_HAS_COINUTILS_PREINSTALLED
    121121  AM_CPPFLAGS = -I`$(CYGPATH_W) $(COINUTILSINSTDIR)/include/coin`
    122122else
     
    175175        ClpQuadraticObjective.hpp \
    176176        ClpSimplex.hpp \
     177        ClpSimplexDual.hpp \
    177178        ClpSimplexNonlinear.hpp \
    178179        ClpSimplexOther.hpp \
  • stable/BSPsplit/Clp/src/Makefile.in

    r1380 r1381  
    1515@SET_MAKE@
    1616
    17 # Copyright (C) 2006 International Business Machines and others.
     17# Copyright (C) 2006, 2009 International Business Machines and others.
    1818# All Rights Reserved.
    1919# This file is distributed under the Common Public License.
     
    4646host_triplet = @host@
    4747bin_PROGRAMS = clp$(EXEEXT)
    48 @COIN_HAS_COINUTILS_INSTALLED_TRUE@am__append_1 = -L$(COINUTILSINSTDIR)/lib -lCoinUtils
    49 @COIN_HAS_COINUTILS_INSTALLED_FALSE@am__append_2 = $(COINUTILSOBJDIR)/src/libCoinUtils.la
    50 @COIN_HAS_COINUTILS_INSTALLED_TRUE@am__append_3 = `cat $(COINUTILSDOCDIR)/coinutils_addlibs.txt`
    51 @COIN_HAS_COINUTILS_INSTALLED_FALSE@am__append_4 = `cat $(COINUTILSOBJDIR)/coinutils_addlibs.txt`
     48@COIN_HAS_COINUTILS_PREINSTALLED_TRUE@am__append_1 = -L`$(CYGPATH_W) $(COINUTILSINSTDIR)/lib` -lCoinUtils
     49@COIN_HAS_COINUTILS_PREINSTALLED_FALSE@am__append_2 = $(COINUTILSOBJDIR)/src/libCoinUtils.la
     50@COIN_HAS_COINUTILS_PREINSTALLED_TRUE@am__append_3 = `cat $(COINUTILSDOCDIR)/coinutils_addlibs.txt`
     51@COIN_HAS_COINUTILS_PREINSTALLED_FALSE@am__append_4 = `cat $(COINUTILSOBJDIR)/coinutils_addlibs.txt`
    5252subdir = src
    5353DIST_COMMON = $(includecoin_HEADERS) $(srcdir)/Makefile.am \
     
    9797        unitTest.$(OBJEXT)
    9898clp_OBJECTS = $(am_clp_OBJECTS)
    99 am__DEPENDENCIES_1 =
    100 @COIN_HAS_COINUTILS_INSTALLED_FALSE@am__DEPENDENCIES_2 = $(COINUTILSOBJDIR)/src/libCoinUtils.la
    101 clp_DEPENDENCIES = libClp.la $(am__DEPENDENCIES_1) \
    102         $(am__DEPENDENCIES_2)
     99@COIN_HAS_COINUTILS_PREINSTALLED_FALSE@am__DEPENDENCIES_1 = $(COINUTILSOBJDIR)/src/libCoinUtils.la
     100clp_DEPENDENCIES = libClp.la $(am__DEPENDENCIES_1)
    103101depcomp = $(SHELL) $(top_srcdir)/../depcomp
    104102am__depfiles_maybe = depfiles
     
    155153COINUTILSSRCDIR = @COINUTILSSRCDIR@
    156154COIN_HAS_CLP_FALSE = @COIN_HAS_CLP_FALSE@
    157 COIN_HAS_CLP_INSTALLED_FALSE = @COIN_HAS_CLP_INSTALLED_FALSE@
    158 COIN_HAS_CLP_INSTALLED_TRUE = @COIN_HAS_CLP_INSTALLED_TRUE@
     155COIN_HAS_CLP_PREINSTALLED_FALSE = @COIN_HAS_CLP_PREINSTALLED_FALSE@
     156COIN_HAS_CLP_PREINSTALLED_TRUE = @COIN_HAS_CLP_PREINSTALLED_TRUE@
    159157COIN_HAS_CLP_TRUE = @COIN_HAS_CLP_TRUE@
    160158COIN_HAS_COINUTILS_FALSE = @COIN_HAS_COINUTILS_FALSE@
    161 COIN_HAS_COINUTILS_INSTALLED_FALSE = @COIN_HAS_COINUTILS_INSTALLED_FALSE@
    162 COIN_HAS_COINUTILS_INSTALLED_TRUE = @COIN_HAS_COINUTILS_INSTALLED_TRUE@
     159COIN_HAS_COINUTILS_PREINSTALLED_FALSE = @COIN_HAS_COINUTILS_PREINSTALLED_FALSE@
     160COIN_HAS_COINUTILS_PREINSTALLED_TRUE = @COIN_HAS_COINUTILS_PREINSTALLED_TRUE@
    163161COIN_HAS_COINUTILS_TRUE = @COIN_HAS_COINUTILS_TRUE@
    164162CPP = @CPP@
     
    194192
    195193# Here we add additional libraries
    196 LIBS = @LIBS@ $(ADDLIBS) $(am__append_3) $(am__append_4)
     194LIBS = @LIBS@ $(am__append_1) $(ADDLIBS) $(am__append_3) \
     195        $(am__append_4)
    197196LIBTOOL = @LIBTOOL@
    198197LIBTOOLM4 = @LIBTOOLM4@
     
    355354
    356355# List all additionally required COIN libraries
    357 clp_LDADD = libClp.la $(am__append_1) $(am__append_2)
     356clp_LDADD = libClp.la $(am__append_2)
    358357
    359358# Finally, the -rpath flag is used by libtool to make sure that the shared
     
    361360# libraries.
    362361clp_LDFLAGS = -rpath $(libdir)
    363 @COIN_HAS_COINUTILS_INSTALLED_FALSE@AM_CPPFLAGS = \
    364 @COIN_HAS_COINUTILS_INSTALLED_FALSE@    -I`$(CYGPATH_W) $(COINUTILSSRCDIR)/src` \
    365 @COIN_HAS_COINUTILS_INSTALLED_FALSE@    -I`$(CYGPATH_W) $(COINUTILSOBJDIR)/inc`
     362@COIN_HAS_COINUTILS_PREINSTALLED_FALSE@AM_CPPFLAGS = \
     363@COIN_HAS_COINUTILS_PREINSTALLED_FALSE@ -I`$(CYGPATH_W) $(COINUTILSSRCDIR)/src` \
     364@COIN_HAS_COINUTILS_PREINSTALLED_FALSE@ -I`$(CYGPATH_W) $(COINUTILSOBJDIR)/inc`
    366365
    367366
     
    372371# Here list all include flags, relative to this "srcdir" directory.  This
    373372# "cygpath" stuff is necessary to compile with native compilers on Windows.
    374 @COIN_HAS_COINUTILS_INSTALLED_TRUE@AM_CPPFLAGS = -I`$(CYGPATH_W) $(COINUTILSINSTDIR)/include/coin`
     373@COIN_HAS_COINUTILS_PREINSTALLED_TRUE@AM_CPPFLAGS = -I`$(CYGPATH_W) $(COINUTILSINSTDIR)/include/coin`
    375374
    376375# This line is necessary to allow VPATH compilation with MS compilers
     
    423422        ClpQuadraticObjective.hpp \
    424423        ClpSimplex.hpp \
     424        ClpSimplexDual.hpp \
    425425        ClpSimplexNonlinear.hpp \
    426426        ClpSimplexOther.hpp \
  • stable/BSPsplit/Clp/test/Makefile.in

    r1380 r1381  
    8484COINUTILSSRCDIR = @COINUTILSSRCDIR@
    8585COIN_HAS_CLP_FALSE = @COIN_HAS_CLP_FALSE@
    86 COIN_HAS_CLP_INSTALLED_FALSE = @COIN_HAS_CLP_INSTALLED_FALSE@
    87 COIN_HAS_CLP_INSTALLED_TRUE = @COIN_HAS_CLP_INSTALLED_TRUE@
     86COIN_HAS_CLP_PREINSTALLED_FALSE = @COIN_HAS_CLP_PREINSTALLED_FALSE@
     87COIN_HAS_CLP_PREINSTALLED_TRUE = @COIN_HAS_CLP_PREINSTALLED_TRUE@
    8888COIN_HAS_CLP_TRUE = @COIN_HAS_CLP_TRUE@
    8989COIN_HAS_COINUTILS_FALSE = @COIN_HAS_COINUTILS_FALSE@
    90 COIN_HAS_COINUTILS_INSTALLED_FALSE = @COIN_HAS_COINUTILS_INSTALLED_FALSE@
    91 COIN_HAS_COINUTILS_INSTALLED_TRUE = @COIN_HAS_COINUTILS_INSTALLED_TRUE@
     90COIN_HAS_COINUTILS_PREINSTALLED_FALSE = @COIN_HAS_COINUTILS_PREINSTALLED_FALSE@
     91COIN_HAS_COINUTILS_PREINSTALLED_TRUE = @COIN_HAS_COINUTILS_PREINSTALLED_TRUE@
    9292COIN_HAS_COINUTILS_TRUE = @COIN_HAS_COINUTILS_TRUE@
    9393CPP = @CPP@
Note: See TracChangeset for help on using the changeset viewer.