Changeset 1573 for trunk/Clp


Ignore:
Timestamp:
Jul 18, 2010 11:12:41 AM (9 years ago)
Author:
stefan
Message:

use PCADDLIBS instead of ADDLIBS to setup .pc file; rerun autotools

Location:
trunk/Clp
Files:
7 edited

Legend:

Unmodified
Added
Removed
  • trunk/Clp/Makefile.in

    r1566 r1573  
    212212PACKAGE_VERSION = @PACKAGE_VERSION@
    213213PATH_SEPARATOR = @PATH_SEPARATOR@
     214PCADDLIBS = @PCADDLIBS@
    214215PKG_CONFIG = @PKG_CONFIG@
    215216RANLIB = @RANLIB@
  • trunk/Clp/clp-uninstalled.pc.in

    r1559 r1573  
    55Description: COIN-OR Linear Programming Solver
    66Version: @PACKAGE_VERSION@
    7 Libs: -L${libdir} -lClp @ADDLIBS@
     7Libs: -L${libdir} -lClp @PCADDLIBS@
    88Cflags: -I@abs_source_dir@/src -I@ABSBUILDDIR@/inc
    99Requires: @REQUIREDPACKAGES@
  • trunk/Clp/clp.pc.in

    r1559 r1573  
    77Description: COIN-OR Linear Programming Solver
    88Version: @PACKAGE_VERSION@
    9 Libs: -L${libdir} -lClp @ADDLIBS@
     9Libs: -L${libdir} -lClp @PCADDLIBS@
    1010Cflags: -I${includedir}
    1111Requires: @REQUIREDPACKAGES@
  • trunk/Clp/configure

    r1572 r1573  
    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 have_svnversion CLP_SVN_REV 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 COIN_HAS_PKGCONFIG_TRUE COIN_HAS_PKGCONFIG_FALSE COIN_PKG_CONFIG_PATH 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'
     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 PCADDLIBS FADDLIBS ALWAYS_FALSE_TRUE ALWAYS_FALSE_FALSE have_svnversion CLP_SVN_REV 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 COIN_HAS_PKGCONFIG_TRUE COIN_HAS_PKGCONFIG_FALSE COIN_PKG_CONFIG_PATH 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
     
    16981698
    16991699
     1700# Initialize the PCADDLIBS variable.
     1701# This variable is used to setup library flags for the "Libs:" section in a .pc file.
     1702# In certain cases, it may contain more flags than the ADDLIBS variable.
     1703PCADDLIBS=""
     1704
     1705
    17001706# As backup, we make sure we don't loose an FLIBS if it has been set
    17011707# by the user
     
    58695875*-*-irix6*)
    58705876  # Find out which ABI we are using.
    5871   echo '#line 5871 "configure"' > conftest.$ac_ext
     5877  echo '#line 5877 "configure"' > conftest.$ac_ext
    58725878  if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
    58735879  (eval $ac_compile) 2>&5
     
    70037009
    70047010# Provide some information about the compiler.
    7005 echo "$as_me:7005:" \
     7011echo "$as_me:7011:" \
    70067012     "checking for Fortran 77 compiler version" >&5
    70077013ac_compiler=`set X $ac_compile; echo $2`
     
    80708076   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    80718077   -e 's:$: $lt_compiler_flag:'`
    8072    (eval echo "\"\$as_me:8072: $lt_compile\"" >&5)
     8078   (eval echo "\"\$as_me:8078: $lt_compile\"" >&5)
    80738079   (eval "$lt_compile" 2>conftest.err)
    80748080   ac_status=$?
    80758081   cat conftest.err >&5
    8076    echo "$as_me:8076: \$? = $ac_status" >&5
     8082   echo "$as_me:8082: \$? = $ac_status" >&5
    80778083   if (exit $ac_status) && test -s "$ac_outfile"; then
    80788084     # The compiler can only warn and ignore the option if not recognized
     
    83388344   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    83398345   -e 's:$: $lt_compiler_flag:'`
    8340    (eval echo "\"\$as_me:8340: $lt_compile\"" >&5)
     8346   (eval echo "\"\$as_me:8346: $lt_compile\"" >&5)
    83418347   (eval "$lt_compile" 2>conftest.err)
    83428348   ac_status=$?
    83438349   cat conftest.err >&5
    8344    echo "$as_me:8344: \$? = $ac_status" >&5
     8350   echo "$as_me:8350: \$? = $ac_status" >&5
    83458351   if (exit $ac_status) && test -s "$ac_outfile"; then
    83468352     # The compiler can only warn and ignore the option if not recognized
     
    84428448   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    84438449   -e 's:$: $lt_compiler_flag:'`
    8444    (eval echo "\"\$as_me:8444: $lt_compile\"" >&5)
     8450   (eval echo "\"\$as_me:8450: $lt_compile\"" >&5)
    84458451   (eval "$lt_compile" 2>out/conftest.err)
    84468452   ac_status=$?
    84478453   cat out/conftest.err >&5
    8448    echo "$as_me:8448: \$? = $ac_status" >&5
     8454   echo "$as_me:8454: \$? = $ac_status" >&5
    84498455   if (exit $ac_status) && test -s out/conftest2.$ac_objext
    84508456   then
     
    1078710793  lt_status=$lt_dlunknown
    1078810794  cat > conftest.$ac_ext <<EOF
    10789 #line 10789 "configure"
     10795#line 10795 "configure"
    1079010796#include "confdefs.h"
    1079110797
     
    1088710893  lt_status=$lt_dlunknown
    1088810894  cat > conftest.$ac_ext <<EOF
    10889 #line 10889 "configure"
     10895#line 10895 "configure"
    1089010896#include "confdefs.h"
    1089110897
     
    1323113237   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1323213238   -e 's:$: $lt_compiler_flag:'`
    13233    (eval echo "\"\$as_me:13233: $lt_compile\"" >&5)
     13239   (eval echo "\"\$as_me:13239: $lt_compile\"" >&5)
    1323413240   (eval "$lt_compile" 2>conftest.err)
    1323513241   ac_status=$?
    1323613242   cat conftest.err >&5
    13237    echo "$as_me:13237: \$? = $ac_status" >&5
     13243   echo "$as_me:13243: \$? = $ac_status" >&5
    1323813244   if (exit $ac_status) && test -s "$ac_outfile"; then
    1323913245     # The compiler can only warn and ignore the option if not recognized
     
    1333513341   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1333613342   -e 's:$: $lt_compiler_flag:'`
    13337    (eval echo "\"\$as_me:13337: $lt_compile\"" >&5)
     13343   (eval echo "\"\$as_me:13343: $lt_compile\"" >&5)
    1333813344   (eval "$lt_compile" 2>out/conftest.err)
    1333913345   ac_status=$?
    1334013346   cat out/conftest.err >&5
    13341    echo "$as_me:13341: \$? = $ac_status" >&5
     13347   echo "$as_me:13347: \$? = $ac_status" >&5
    1334213348   if (exit $ac_status) && test -s out/conftest2.$ac_objext
    1334313349   then
     
    1490514911   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1490614912   -e 's:$: $lt_compiler_flag:'`
    14907    (eval echo "\"\$as_me:14907: $lt_compile\"" >&5)
     14913   (eval echo "\"\$as_me:14913: $lt_compile\"" >&5)
    1490814914   (eval "$lt_compile" 2>conftest.err)
    1490914915   ac_status=$?
    1491014916   cat conftest.err >&5
    14911    echo "$as_me:14911: \$? = $ac_status" >&5
     14917   echo "$as_me:14917: \$? = $ac_status" >&5
    1491214918   if (exit $ac_status) && test -s "$ac_outfile"; then
    1491314919     # The compiler can only warn and ignore the option if not recognized
     
    1500915015   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1501015016   -e 's:$: $lt_compiler_flag:'`
    15011    (eval echo "\"\$as_me:15011: $lt_compile\"" >&5)
     15017   (eval echo "\"\$as_me:15017: $lt_compile\"" >&5)
    1501215018   (eval "$lt_compile" 2>out/conftest.err)
    1501315019   ac_status=$?
    1501415020   cat out/conftest.err >&5
    15015    echo "$as_me:15015: \$? = $ac_status" >&5
     15021   echo "$as_me:15021: \$? = $ac_status" >&5
    1501615022   if (exit $ac_status) && test -s out/conftest2.$ac_objext
    1501715023   then
     
    1721617222   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1721717223   -e 's:$: $lt_compiler_flag:'`
    17218    (eval echo "\"\$as_me:17218: $lt_compile\"" >&5)
     17224   (eval echo "\"\$as_me:17224: $lt_compile\"" >&5)
    1721917225   (eval "$lt_compile" 2>conftest.err)
    1722017226   ac_status=$?
    1722117227   cat conftest.err >&5
    17222    echo "$as_me:17222: \$? = $ac_status" >&5
     17228   echo "$as_me:17228: \$? = $ac_status" >&5
    1722317229   if (exit $ac_status) && test -s "$ac_outfile"; then
    1722417230     # The compiler can only warn and ignore the option if not recognized
     
    1748417490   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1748517491   -e 's:$: $lt_compiler_flag:'`
    17486    (eval echo "\"\$as_me:17486: $lt_compile\"" >&5)
     17492   (eval echo "\"\$as_me:17492: $lt_compile\"" >&5)
    1748717493   (eval "$lt_compile" 2>conftest.err)
    1748817494   ac_status=$?
    1748917495   cat conftest.err >&5
    17490    echo "$as_me:17490: \$? = $ac_status" >&5
     17496   echo "$as_me:17496: \$? = $ac_status" >&5
    1749117497   if (exit $ac_status) && test -s "$ac_outfile"; then
    1749217498     # The compiler can only warn and ignore the option if not recognized
     
    1758817594   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1758917595   -e 's:$: $lt_compiler_flag:'`
    17590    (eval echo "\"\$as_me:17590: $lt_compile\"" >&5)
     17596   (eval echo "\"\$as_me:17596: $lt_compile\"" >&5)
    1759117597   (eval "$lt_compile" 2>out/conftest.err)
    1759217598   ac_status=$?
    1759317599   cat out/conftest.err >&5
    17594    echo "$as_me:17594: \$? = $ac_status" >&5
     17600   echo "$as_me:17600: \$? = $ac_status" >&5
    1759517601   if (exit $ac_status) && test -s out/conftest2.$ac_objext
    1759617602   then
     
    2070020706
    2070120707
    20702 #check if user provided LIBS, CFLAGS, and DATA for module
     20708#check if user provided LIBS, CFLAGS, or DATA for module
    2070320709if test $coin_has_coinutils != skipping; then
    2070420710
     
    2070920715  coin_has_coinutils=yes
    2071020716       COINUTILS_LIBS="$withval"
    20711        ADDLIBS="$withval $ADDLIBS"
     20717       PCADDLIBS="$withval $PCADDLIBS"
    2071220718
    2071320719fi;
     
    2100021006    COINUTILS_DATA=`sed -n -e 's/datadir=//gp' ../CoinUtils/coinutils-uninstalled.pc`
    2100121007
    21002     ADDLIBS="$COINUTILS_LIBS $ADDLIBS"
    21003        REQUIREDPACKAGES="coinutils $REQUIREDPACKAGES"
     21008    REQUIREDPACKAGES="coinutils $REQUIREDPACKAGES"
    2100421009
    2100521010
     
    2107021075
    2107121076
    21072 #check if user provided LIBS, CFLAGS, and DATA for module
     21077#check if user provided LIBS, CFLAGS, or DATA for module
    2107321078if test $coin_has_osi != skipping; then
    2107421079
     
    2129721302
    2129821303
    21299 #check if user provided LIBS, CFLAGS, and DATA for module
     21304#check if user provided LIBS, CFLAGS, or DATA for module
    2130021305if test $coin_has_ositests != skipping; then
    2130121306
     
    2152421529
    2152521530
    21526 #check if user provided LIBS, CFLAGS, and DATA for module
     21531#check if user provided LIBS, CFLAGS, or DATA for module
    2152721532if test $coin_has_sample != skipping; then
    2152821533
     
    2175121756
    2175221757
    21753 #check if user provided LIBS, CFLAGS, and DATA for module
     21758#check if user provided LIBS, CFLAGS, or DATA for module
    2175421759if test $coin_has_netlib != skipping; then
    2175521760
     
    2247322478    ADDLIBS="$ADDLIBS $FLIBS"
    2247422479  fi
     22480  PCADDLIBS="$PCADDLIBS $ADDLIBS"
    2247522481
    2247622482  # library extension
     
    2327023276s,@build_os@,$build_os,;t t
    2327123277s,@ADDLIBS@,$ADDLIBS,;t t
     23278s,@PCADDLIBS@,$PCADDLIBS,;t t
    2327223279s,@FADDLIBS@,$FADDLIBS,;t t
    2327323280s,@ALWAYS_FALSE_TRUE@,$ALWAYS_FALSE_TRUE,;t t
  • trunk/Clp/src/Makefile.in

    r1566 r1573  
    227227PACKAGE_VERSION = @PACKAGE_VERSION@
    228228PATH_SEPARATOR = @PATH_SEPARATOR@
     229PCADDLIBS = @PCADDLIBS@
    229230PKG_CONFIG = @PKG_CONFIG@
    230231RANLIB = @RANLIB@
  • trunk/Clp/src/OsiClp/Makefile.in

    r1566 r1573  
    195195PACKAGE_VERSION = @PACKAGE_VERSION@
    196196PATH_SEPARATOR = @PATH_SEPARATOR@
     197PCADDLIBS = @PCADDLIBS@
    197198PKG_CONFIG = @PKG_CONFIG@
    198199RANLIB = @RANLIB@
  • trunk/Clp/test/Makefile.in

    r1566 r1573  
    183183PACKAGE_VERSION = @PACKAGE_VERSION@
    184184PATH_SEPARATOR = @PATH_SEPARATOR@
     185PCADDLIBS = @PCADDLIBS@
    185186PKG_CONFIG = @PKG_CONFIG@
    186187RANLIB = @RANLIB@
Note: See TracChangeset for help on using the changeset viewer.