Changeset 1657 for trunk/Clp


Ignore:
Timestamp:
Jan 1, 2011 1:37:58 PM (9 years ago)
Author:
stefan
Message:

add URL into .pc field; rerun autotools

Location:
trunk/Clp
Files:
9 edited

Legend:

Unmodified
Added
Removed
  • trunk/Clp/Makefile.in

    r1655 r1657  
    116116ABSBUILDDIR = @ABSBUILDDIR@
    117117ACLOCAL = @ACLOCAL@
    118 ADDLIBS = @ADDLIBS@
    119118ADD_CFLAGS = @ADD_CFLAGS@
    120119ADD_CXXFLAGS = @ADD_CXXFLAGS@
     
    187186EXEEXT = @EXEEXT@
    188187F77 = @F77@
    189 FADDLIBS = @FADDLIBS@
    190188FFLAGS = @FFLAGS@
    191189HAVE_EXTERNALS_FALSE = @HAVE_EXTERNALS_FALSE@
     
    248246PACKAGE_VERSION = @PACKAGE_VERSION@
    249247PATH_SEPARATOR = @PATH_SEPARATOR@
    250 PCADDLIBS = @PCADDLIBS@
    251248PKG_CONFIG = @PKG_CONFIG@
    252249RANLIB = @RANLIB@
  • trunk/Clp/clp-uninstalled.pc.in

    r1644 r1657  
    44Name: CLP
    55Description: COIN-OR Linear Programming Solver
     6URL: https://projects.coin-or.org/Clp
    67Version: @PACKAGE_VERSION@
    78Libs: ${libdir}/libClp.la @CLPLIB_PCLIBS@
  • trunk/Clp/clp.pc.in

    r1603 r1657  
    66Name: CLP
    77Description: COIN-OR Linear Programming Solver
     8URL: https://projects.coin-or.org/Clp
    89Version: @PACKAGE_VERSION@
    910Libs: -L${libdir} -lClp @CLPLIB_PCLIBS@
  • trunk/Clp/configure

    r1655 r1657  
    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 PCADDLIBS FADDLIBS ALWAYS_FALSE_TRUE ALWAYS_FALSE_FALSE have_svnversion CLP_SVN_REV COIN_CC_IS_CL_TRUE COIN_CC_IS_CL_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 COIN_CXX_IS_CL_TRUE COIN_CXX_IS_CL_FALSE 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 COIN_PKG_CONFIG_PATH_UNINSTALLED COINUTILS_LIBS COINUTILS_CFLAGS COINUTILS_DATA COINUTILS_DEPENDENCIES COINUTILS_LIBS_INSTALLED COINUTILS_CFLAGS_INSTALLED COINUTILS_DATA_INSTALLED CLPLIB_CFLAGS CLPLIB_LIBS CLPLIB_PCLIBS CLPLIB_PCREQUIRES CLPLIB_DEPENDENCIES CLPLIB_CFLAGS_INSTALLED CLPLIB_LIBS_INSTALLED COIN_HAS_COINUTILS_TRUE COIN_HAS_COINUTILS_FALSE OSI_LIBS OSI_CFLAGS OSI_DATA OSI_DEPENDENCIES OSI_LIBS_INSTALLED OSI_CFLAGS_INSTALLED OSI_DATA_INSTALLED OSICLPLIB_CFLAGS OSICLPLIB_LIBS OSICLPLIB_PCLIBS OSICLPLIB_PCREQUIRES OSICLPLIB_DEPENDENCIES OSICLPLIB_CFLAGS_INSTALLED OSICLPLIB_LIBS_INSTALLED COIN_HAS_OSI_TRUE COIN_HAS_OSI_FALSE OSITESTS_LIBS OSITESTS_CFLAGS OSITESTS_DATA OSITESTS_DEPENDENCIES OSITESTS_LIBS_INSTALLED OSITESTS_CFLAGS_INSTALLED OSITESTS_DATA_INSTALLED COIN_HAS_OSITESTS_TRUE COIN_HAS_OSITESTS_FALSE SAMPLE_LIBS SAMPLE_CFLAGS SAMPLE_DATA SAMPLE_DEPENDENCIES SAMPLE_LIBS_INSTALLED SAMPLE_CFLAGS_INSTALLED SAMPLE_DATA_INSTALLED COIN_HAS_SAMPLE_TRUE COIN_HAS_SAMPLE_FALSE NETLIB_LIBS NETLIB_CFLAGS NETLIB_DATA NETLIB_DEPENDENCIES NETLIB_LIBS_INSTALLED NETLIB_CFLAGS_INSTALLED NETLIB_DATA_INSTALLED COIN_HAS_NETLIB_TRUE COIN_HAS_NETLIB_FALSE coin_have_doxygen coin_doxy_usedot coin_doxy_tagname coin_doxy_logname coin_doxy_tagfiles coin_doxy_excludes 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 ALWAYS_FALSE_TRUE ALWAYS_FALSE_FALSE have_svnversion CLP_SVN_REV COIN_CC_IS_CL_TRUE COIN_CC_IS_CL_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 COIN_CXX_IS_CL_TRUE COIN_CXX_IS_CL_FALSE 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 COIN_PKG_CONFIG_PATH_UNINSTALLED COINUTILS_LIBS COINUTILS_CFLAGS COINUTILS_DATA COINUTILS_DEPENDENCIES COINUTILS_LIBS_INSTALLED COINUTILS_CFLAGS_INSTALLED COINUTILS_DATA_INSTALLED CLPLIB_CFLAGS CLPLIB_LIBS CLPLIB_PCLIBS CLPLIB_PCREQUIRES CLPLIB_DEPENDENCIES CLPLIB_CFLAGS_INSTALLED CLPLIB_LIBS_INSTALLED COIN_HAS_COINUTILS_TRUE COIN_HAS_COINUTILS_FALSE OSI_LIBS OSI_CFLAGS OSI_DATA OSI_DEPENDENCIES OSI_LIBS_INSTALLED OSI_CFLAGS_INSTALLED OSI_DATA_INSTALLED OSICLPLIB_CFLAGS OSICLPLIB_LIBS OSICLPLIB_PCLIBS OSICLPLIB_PCREQUIRES OSICLPLIB_DEPENDENCIES OSICLPLIB_CFLAGS_INSTALLED OSICLPLIB_LIBS_INSTALLED COIN_HAS_OSI_TRUE COIN_HAS_OSI_FALSE OSITESTS_LIBS OSITESTS_CFLAGS OSITESTS_DATA OSITESTS_DEPENDENCIES OSITESTS_LIBS_INSTALLED OSITESTS_CFLAGS_INSTALLED OSITESTS_DATA_INSTALLED COIN_HAS_OSITESTS_TRUE COIN_HAS_OSITESTS_FALSE SAMPLE_LIBS SAMPLE_CFLAGS SAMPLE_DATA SAMPLE_DEPENDENCIES SAMPLE_LIBS_INSTALLED SAMPLE_CFLAGS_INSTALLED SAMPLE_DATA_INSTALLED COIN_HAS_SAMPLE_TRUE COIN_HAS_SAMPLE_FALSE NETLIB_LIBS NETLIB_CFLAGS NETLIB_DATA NETLIB_DEPENDENCIES NETLIB_LIBS_INSTALLED NETLIB_CFLAGS_INSTALLED NETLIB_DATA_INSTALLED COIN_HAS_NETLIB_TRUE COIN_HAS_NETLIB_FALSE coin_have_doxygen coin_doxy_usedot coin_doxy_tagname coin_doxy_logname coin_doxy_tagfiles coin_doxy_excludes LIBEXT VPATH_DISTCLEANFILES ABSBUILDDIR LIBOBJS LTLIBOBJS'
    476476ac_subst_files=''
    477477
     
    16981698# externals.  The following macro ensures that those externals are
    16991699# retrieved by svn if they are not there yet.
    1700 # Initialize the ADDLIBS variable
    1701 ADDLIBS="-lm $LIBS"
    1702 
    1703 
    1704 # Initialize the PCADDLIBS variable.
    1705 # This variable is used to setup library flags for the "Libs:" section in a .pc file.
    1706 # In certain cases, it may contain more flags than the ADDLIBS variable.
    1707 PCADDLIBS=""
    1708 
    17091700
    17101701# As backup, we make sure we don't loose an FLIBS if it has been set
    17111702# by the user
    17121703save_FLIBS="$FLIBS"
    1713 
    1714 # Initialize the FADDLIBS variable (which is to be used with a fortran
    1715 # compiler and will not include FLIBS)
    1716 FADDLIBS="$LIBS"
    1717 
    17181704
    17191705# A useful makefile conditional that is always false
     
    20692055             fi
    20702056             ;;
     2057  *-linux-gnu*) comps="gcc cc pgcc icc xlc" ;;
    20712058  *-linux-*) comps="xlc gcc cc pgcc icc" ;;
    20722059  *)         comps="xlc_r xlc cc gcc pgcc icc" ;;
     
    32083195fi
    32093196
    3210 # Correct ADDLIBS initialization if we are using the MS compiler
     3197# Correct the LD variable if we are using the MS or Intel-windows compiler
    32113198case "$CC" in
    32123199  cl* | */cl* | CL* | */CL* | icl* | */icl* | ICL* | */ICL*)
    3213     ADDLIBS=
    32143200    case $build in
    32153201  *-mingw*)
     
    32663252             comps="CC xlC_r aCC g++ c++ pgCC icpc gpp cxx cc++ cl FCC KCC RCC" ;;
    32673253  *-darwin*) comps="g++ c++ CC" ;;
     3254  *-linux-gnu*)
     3255             comps="g++ c++ pgCC icpc gpp cxx cc++ cl FCC KCC RCC xlC_r aCC CC" ;;
    32683256          *) comps="xlC_r aCC CC g++ c++ pgCC icpc gpp cxx cc++ cl FCC KCC RCC" ;;
    32693257esac
     
    41464134fi
    41474135
     4136# correct the LD variable in a mingw build with MS or intel compiler
    41484137case "$CXX" in
    4149   cl* | */cl* | CL* | */CL* )
     4138  cl* | */cl* | CL* | */CL* | icl* | */icl* | ICL* | */ICL*)
    41504139    case $build in
    41514140  *-mingw*)
     
    53325321full_prefix=`cd $full_prefix ; pwd`
    53335322
    5334 abs_lib_dir=$full_prefix/lib/coin
     5323abs_lib_dir=$full_prefix/lib
    53355324
    53365325abs_include_dir=$full_prefix/include
     
    59165905*-*-irix6*)
    59175906  # Find out which ABI we are using.
    5918   echo '#line 5918 "configure"' > conftest.$ac_ext
     5907  echo '#line 5907 "configure"' > conftest.$ac_ext
    59195908  if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
    59205909  (eval $ac_compile) 2>&5
     
    70507039
    70517040# Provide some information about the compiler.
    7052 echo "$as_me:7052:" \
     7041echo "$as_me:7041:" \
    70537042     "checking for Fortran 77 compiler version" >&5
    70547043ac_compiler=`set X $ac_compile; echo $2`
     
    81178106   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    81188107   -e 's:$: $lt_compiler_flag:'`
    8119    (eval echo "\"\$as_me:8119: $lt_compile\"" >&5)
     8108   (eval echo "\"\$as_me:8108: $lt_compile\"" >&5)
    81208109   (eval "$lt_compile" 2>conftest.err)
    81218110   ac_status=$?
    81228111   cat conftest.err >&5
    8123    echo "$as_me:8123: \$? = $ac_status" >&5
     8112   echo "$as_me:8112: \$? = $ac_status" >&5
    81248113   if (exit $ac_status) && test -s "$ac_outfile"; then
    81258114     # The compiler can only warn and ignore the option if not recognized
     
    83858374   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    83868375   -e 's:$: $lt_compiler_flag:'`
    8387    (eval echo "\"\$as_me:8387: $lt_compile\"" >&5)
     8376   (eval echo "\"\$as_me:8376: $lt_compile\"" >&5)
    83888377   (eval "$lt_compile" 2>conftest.err)
    83898378   ac_status=$?
    83908379   cat conftest.err >&5
    8391    echo "$as_me:8391: \$? = $ac_status" >&5
     8380   echo "$as_me:8380: \$? = $ac_status" >&5
    83928381   if (exit $ac_status) && test -s "$ac_outfile"; then
    83938382     # The compiler can only warn and ignore the option if not recognized
     
    84898478   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    84908479   -e 's:$: $lt_compiler_flag:'`
    8491    (eval echo "\"\$as_me:8491: $lt_compile\"" >&5)
     8480   (eval echo "\"\$as_me:8480: $lt_compile\"" >&5)
    84928481   (eval "$lt_compile" 2>out/conftest.err)
    84938482   ac_status=$?
    84948483   cat out/conftest.err >&5
    8495    echo "$as_me:8495: \$? = $ac_status" >&5
     8484   echo "$as_me:8484: \$? = $ac_status" >&5
    84968485   if (exit $ac_status) && test -s out/conftest2.$ac_objext
    84978486   then
     
    1083410823  lt_status=$lt_dlunknown
    1083510824  cat > conftest.$ac_ext <<EOF
    10836 #line 10836 "configure"
     10825#line 10825 "configure"
    1083710826#include "confdefs.h"
    1083810827
     
    1093410923  lt_status=$lt_dlunknown
    1093510924  cat > conftest.$ac_ext <<EOF
    10936 #line 10936 "configure"
     10925#line 10925 "configure"
    1093710926#include "confdefs.h"
    1093810927
     
    1327813267   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1327913268   -e 's:$: $lt_compiler_flag:'`
    13280    (eval echo "\"\$as_me:13280: $lt_compile\"" >&5)
     13269   (eval echo "\"\$as_me:13269: $lt_compile\"" >&5)
    1328113270   (eval "$lt_compile" 2>conftest.err)
    1328213271   ac_status=$?
    1328313272   cat conftest.err >&5
    13284    echo "$as_me:13284: \$? = $ac_status" >&5
     13273   echo "$as_me:13273: \$? = $ac_status" >&5
    1328513274   if (exit $ac_status) && test -s "$ac_outfile"; then
    1328613275     # The compiler can only warn and ignore the option if not recognized
     
    1338213371   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1338313372   -e 's:$: $lt_compiler_flag:'`
    13384    (eval echo "\"\$as_me:13384: $lt_compile\"" >&5)
     13373   (eval echo "\"\$as_me:13373: $lt_compile\"" >&5)
    1338513374   (eval "$lt_compile" 2>out/conftest.err)
    1338613375   ac_status=$?
    1338713376   cat out/conftest.err >&5
    13388    echo "$as_me:13388: \$? = $ac_status" >&5
     13377   echo "$as_me:13377: \$? = $ac_status" >&5
    1338913378   if (exit $ac_status) && test -s out/conftest2.$ac_objext
    1339013379   then
     
    1495214941   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1495314942   -e 's:$: $lt_compiler_flag:'`
    14954    (eval echo "\"\$as_me:14954: $lt_compile\"" >&5)
     14943   (eval echo "\"\$as_me:14943: $lt_compile\"" >&5)
    1495514944   (eval "$lt_compile" 2>conftest.err)
    1495614945   ac_status=$?
    1495714946   cat conftest.err >&5
    14958    echo "$as_me:14958: \$? = $ac_status" >&5
     14947   echo "$as_me:14947: \$? = $ac_status" >&5
    1495914948   if (exit $ac_status) && test -s "$ac_outfile"; then
    1496014949     # The compiler can only warn and ignore the option if not recognized
     
    1505615045   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1505715046   -e 's:$: $lt_compiler_flag:'`
    15058    (eval echo "\"\$as_me:15058: $lt_compile\"" >&5)
     15047   (eval echo "\"\$as_me:15047: $lt_compile\"" >&5)
    1505915048   (eval "$lt_compile" 2>out/conftest.err)
    1506015049   ac_status=$?
    1506115050   cat out/conftest.err >&5
    15062    echo "$as_me:15062: \$? = $ac_status" >&5
     15051   echo "$as_me:15051: \$? = $ac_status" >&5
    1506315052   if (exit $ac_status) && test -s out/conftest2.$ac_objext
    1506415053   then
     
    1726317252   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1726417253   -e 's:$: $lt_compiler_flag:'`
    17265    (eval echo "\"\$as_me:17265: $lt_compile\"" >&5)
     17254   (eval echo "\"\$as_me:17254: $lt_compile\"" >&5)
    1726617255   (eval "$lt_compile" 2>conftest.err)
    1726717256   ac_status=$?
    1726817257   cat conftest.err >&5
    17269    echo "$as_me:17269: \$? = $ac_status" >&5
     17258   echo "$as_me:17258: \$? = $ac_status" >&5
    1727017259   if (exit $ac_status) && test -s "$ac_outfile"; then
    1727117260     # The compiler can only warn and ignore the option if not recognized
     
    1753117520   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1753217521   -e 's:$: $lt_compiler_flag:'`
    17533    (eval echo "\"\$as_me:17533: $lt_compile\"" >&5)
     17522   (eval echo "\"\$as_me:17522: $lt_compile\"" >&5)
    1753417523   (eval "$lt_compile" 2>conftest.err)
    1753517524   ac_status=$?
    1753617525   cat conftest.err >&5
    17537    echo "$as_me:17537: \$? = $ac_status" >&5
     17526   echo "$as_me:17526: \$? = $ac_status" >&5
    1753817527   if (exit $ac_status) && test -s "$ac_outfile"; then
    1753917528     # The compiler can only warn and ignore the option if not recognized
     
    1763517624   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1763617625   -e 's:$: $lt_compiler_flag:'`
    17637    (eval echo "\"\$as_me:17637: $lt_compile\"" >&5)
     17626   (eval echo "\"\$as_me:17626: $lt_compile\"" >&5)
    1763817627   (eval "$lt_compile" 2>out/conftest.err)
    1763917628   ac_status=$?
    1764017629   cat out/conftest.err >&5
    17641    echo "$as_me:17641: \$? = $ac_status" >&5
     17630   echo "$as_me:17630: \$? = $ac_status" >&5
    1764217631   if (exit $ac_status) && test -s out/conftest2.$ac_objext
    1764317632   then
     
    2043420423      if test "$GXX" = "yes"; then
    2043520424        RPATH_FLAGS=
    20436         for dir in $abs_lib_dir $abs_lib_dir/ThirdParty; do
     20425        for dir in $abs_lib_dir; do
    2043720426          RPATH_FLAGS="$RPATH_FLAGS -Wl,--rpath -Wl,$dir"
    2043820427        done
     
    2045120440    *-*-solaris*)
    2045220441        RPATH_FLAGS=
    20453         for dir in $abs_lib_dir $abs_lib_dir/ThirdParty; do
     20442        for dir in $abs_lib_dir; do
    2045420443          RPATH_FLAGS="$RPATH_FLAGS -R$dir"
    2045520444        done
     
    2071520704        COIN_PKG_CONFIG_PATH_UNINSTALLED="`cd ../$i; pwd`:${COIN_PKG_CONFIG_PATH_UNINSTALLED}"
    2071620705      fi
     20706      if test -d ../$i/pkgconfig ; then
     20707        COIN_PKG_CONFIG_PATH_UNINSTALLED="`cd ../$i/pkgconfig; pwd`:${COIN_PKG_CONFIG_PATH_UNINSTALLED}"
     20708      fi
    2071720709    done
    2071820710  fi
     
    2072220714      if test -d ../../$i ; then
    2072320715        COIN_PKG_CONFIG_PATH_UNINSTALLED="`cd ../../$i; pwd`:${COIN_PKG_CONFIG_PATH_UNINSTALLED}"
     20716      fi
     20717      if test -d ../../$i/pkgconfig ; then
     20718        COIN_PKG_CONFIG_PATH_UNINSTALLED="`cd ../../$i/pkgconfig; pwd`:${COIN_PKG_CONFIG_PATH_UNINSTALLED}"
    2072420719      fi
    2072520720    done
     
    2081520810if test -n "$PKG_CONFIG" ; then
    2081620811  if $PKG_CONFIG --exists "coinutils"; then
    20817     COINUTILS_VERSIONS="`$PKG_CONFIG --modversion "coinutils" 2>/dev/null`"
     20812    COINUTILS_VERSIONS="`$PKG_CONFIG --modversion "coinutils" 2>/dev/null | tr '\n' ' '`"
    2081820813     cflags=`$PKG_CONFIG --cflags "coinutils" 2>/dev/null`
    2081920814    # pkg-config cannot handle spaces, so CYGPATH_W cannot be put into .pc files
     
    2111721112  # construct dependencies variables from LIBS variables
    2111821113  # we add an extra space in LIBS so we can substitute out everything starting with " -"
     21114  # before, substitute out everything of the form -framework xxx as used on Mac
    2111921115  # also substitute out everything of the form `xxx`yyy (may have been added for cygwin/cl)
    21120   COINUTILS_DEPENDENCIES=`echo " $COINUTILS_LIBS" | sed -e 's/ -[^ ]*//g' -e 's/\`[^\`]*\`[^ ]* //g'`
    21121 
    21122     CLPLIB_DEPENDENCIES=`echo " $CLPLIB_LIBS " | sed -e 's/ -[^ ]*//g' -e 's/\`[^\`]*\`[^ ]* //g'`
     21116  COINUTILS_DEPENDENCIES=`echo " $COINUTILS_LIBS" | sed -e 's/ -framework  *[^ ]*//g' -e 's/ -[^ ]*//g' -e 's/\`[^\`]*\`[^ ]* //g'`
     21117
     21118    CLPLIB_DEPENDENCIES=`echo " $CLPLIB_LIBS " | sed -e 's/ -framework  *[^ ]*//g' -e 's/ -[^ ]*//g' -e 's/\`[^\`]*\`[^ ]* //g'`
    2112321119
    2112421120
     
    2125921255if test -n "$PKG_CONFIG" ; then
    2126021256  if $PKG_CONFIG --exists "osi"; then
    21261     OSI_VERSIONS="`$PKG_CONFIG --modversion "osi" 2>/dev/null`"
     21257    OSI_VERSIONS="`$PKG_CONFIG --modversion "osi" 2>/dev/null | tr '\n' ' '`"
    2126221258     cflags=`$PKG_CONFIG --cflags "osi" 2>/dev/null`
    2126321259    # pkg-config cannot handle spaces, so CYGPATH_W cannot be put into .pc files
     
    2156121557  # construct dependencies variables from LIBS variables
    2156221558  # we add an extra space in LIBS so we can substitute out everything starting with " -"
     21559  # before, substitute out everything of the form -framework xxx as used on Mac
    2156321560  # also substitute out everything of the form `xxx`yyy (may have been added for cygwin/cl)
    21564   OSI_DEPENDENCIES=`echo " $OSI_LIBS" | sed -e 's/ -[^ ]*//g' -e 's/\`[^\`]*\`[^ ]* //g'`
    21565 
    21566     OSICLPLIB_DEPENDENCIES=`echo " $OSICLPLIB_LIBS " | sed -e 's/ -[^ ]*//g' -e 's/\`[^\`]*\`[^ ]* //g'`
     21561  OSI_DEPENDENCIES=`echo " $OSI_LIBS" | sed -e 's/ -framework  *[^ ]*//g' -e 's/ -[^ ]*//g' -e 's/\`[^\`]*\`[^ ]* //g'`
     21562
     21563    OSICLPLIB_DEPENDENCIES=`echo " $OSICLPLIB_LIBS " | sed -e 's/ -framework  *[^ ]*//g' -e 's/ -[^ ]*//g' -e 's/\`[^\`]*\`[^ ]* //g'`
    2156721564
    2156821565
     
    2168621683if test -n "$PKG_CONFIG" ; then
    2168721684  if $PKG_CONFIG --exists "osi-unittests"; then
    21688     OSITESTS_VERSIONS="`$PKG_CONFIG --modversion "osi-unittests" 2>/dev/null`"
     21685    OSITESTS_VERSIONS="`$PKG_CONFIG --modversion "osi-unittests" 2>/dev/null | tr '\n' ' '`"
    2168921686     cflags=`$PKG_CONFIG --cflags "osi-unittests" 2>/dev/null`
    2169021687    # pkg-config cannot handle spaces, so CYGPATH_W cannot be put into .pc files
     
    2197821975  # construct dependencies variables from LIBS variables
    2197921976  # we add an extra space in LIBS so we can substitute out everything starting with " -"
     21977  # before, substitute out everything of the form -framework xxx as used on Mac
    2198021978  # also substitute out everything of the form `xxx`yyy (may have been added for cygwin/cl)
    21981   OSITESTS_DEPENDENCIES=`echo " $OSITESTS_LIBS" | sed -e 's/ -[^ ]*//g' -e 's/\`[^\`]*\`[^ ]* //g'`
     21979  OSITESTS_DEPENDENCIES=`echo " $OSITESTS_LIBS" | sed -e 's/ -framework  *[^ ]*//g' -e 's/ -[^ ]*//g' -e 's/\`[^\`]*\`[^ ]* //g'`
    2198221980
    2198321981
     
    2209422092if test -n "$PKG_CONFIG" ; then
    2209522093  if $PKG_CONFIG --exists "coindatasample"; then
    22096     SAMPLE_VERSIONS="`$PKG_CONFIG --modversion "coindatasample" 2>/dev/null`"
     22094    SAMPLE_VERSIONS="`$PKG_CONFIG --modversion "coindatasample" 2>/dev/null | tr '\n' ' '`"
    2209722095     cflags=`$PKG_CONFIG --cflags "coindatasample" 2>/dev/null`
    2209822096    # pkg-config cannot handle spaces, so CYGPATH_W cannot be put into .pc files
     
    2238622384  # construct dependencies variables from LIBS variables
    2238722385  # we add an extra space in LIBS so we can substitute out everything starting with " -"
     22386  # before, substitute out everything of the form -framework xxx as used on Mac
    2238822387  # also substitute out everything of the form `xxx`yyy (may have been added for cygwin/cl)
    22389   SAMPLE_DEPENDENCIES=`echo " $SAMPLE_LIBS" | sed -e 's/ -[^ ]*//g' -e 's/\`[^\`]*\`[^ ]* //g'`
     22388  SAMPLE_DEPENDENCIES=`echo " $SAMPLE_LIBS" | sed -e 's/ -framework  *[^ ]*//g' -e 's/ -[^ ]*//g' -e 's/\`[^\`]*\`[^ ]* //g'`
    2239022389
    2239122390
     
    2250222501if test -n "$PKG_CONFIG" ; then
    2250322502  if $PKG_CONFIG --exists "coindatanetlib"; then
    22504     NETLIB_VERSIONS="`$PKG_CONFIG --modversion "coindatanetlib" 2>/dev/null`"
     22503    NETLIB_VERSIONS="`$PKG_CONFIG --modversion "coindatanetlib" 2>/dev/null | tr '\n' ' '`"
    2250522504     cflags=`$PKG_CONFIG --cflags "coindatanetlib" 2>/dev/null`
    2250622505    # pkg-config cannot handle spaces, so CYGPATH_W cannot be put into .pc files
     
    2279422793  # construct dependencies variables from LIBS variables
    2279522794  # we add an extra space in LIBS so we can substitute out everything starting with " -"
     22795  # before, substitute out everything of the form -framework xxx as used on Mac
    2279622796  # also substitute out everything of the form `xxx`yyy (may have been added for cygwin/cl)
    22797   NETLIB_DEPENDENCIES=`echo " $NETLIB_LIBS" | sed -e 's/ -[^ ]*//g' -e 's/\`[^\`]*\`[^ ]* //g'`
     22797  NETLIB_DEPENDENCIES=`echo " $NETLIB_LIBS" | sed -e 's/ -framework  *[^ ]*//g' -e 's/ -[^ ]*//g' -e 's/\`[^\`]*\`[^ ]* //g'`
    2279822798
    2279922799
     
    2326423264echo "${ECHO_T}$ac_cv_lib_readline_readline" >&6
    2326523265if test $ac_cv_lib_readline_readline = yes; then
    23266   ADDLIBS="-lreadline $LIBS $ADDLIBS"
    2326723266
    2326823267                    CLPLIB_LIBS="-lreadline $LIBS $CLPLIB_LIBS"
     
    2327023269                    CLPLIB_LIBS_INSTALLED="-lreadline $LIBS $CLPLIB_LIBS_INSTALLED"
    2327123270
    23272 
     23271                 :
    2327323272else
    2327423273  coin_has_readline=no
     
    2347423473          echo "$as_me:$LINENO: result: $doxydir (tag)" >&5
    2347523474echo "${ECHO_T}$doxydir (tag)" >&6
    23476           coin_doxy_excludes="$coin_doxy_excludes */${proj}*"
     23475          coin_doxy_excludes="$coin_doxy_excludes */${proj}"
    2347723476        else
    2347823477          # will process the source -- nothing further to be done here
     
    2354123540
    2354223541if test x$coin_skip_ac_output != xyes; then
    23543 
    23544   FADDLIBS="$ADDLIBS"
    23545   if test x"$coin_need_flibs" = xyes; then
    23546     ADDLIBS="$ADDLIBS $FLIBS"
    23547   fi
    23548   PCADDLIBS="$PCADDLIBS $ADDLIBS"
    2354923542
    2355023543  # library extension
     
    2435824351s,@build_vendor@,$build_vendor,;t t
    2435924352s,@build_os@,$build_os,;t t
    24360 s,@ADDLIBS@,$ADDLIBS,;t t
    24361 s,@PCADDLIBS@,$PCADDLIBS,;t t
    24362 s,@FADDLIBS@,$FADDLIBS,;t t
    2436324353s,@ALWAYS_FALSE_TRUE@,$ALWAYS_FALSE_TRUE,;t t
    2436424354s,@ALWAYS_FALSE_FALSE@,$ALWAYS_FALSE_FALSE,;t t
  • trunk/Clp/src/Makefile.in

    r1655 r1657  
    128128ABSBUILDDIR = @ABSBUILDDIR@
    129129ACLOCAL = @ACLOCAL@
    130 ADDLIBS = @ADDLIBS@
    131130ADD_CFLAGS = @ADD_CFLAGS@
    132131ADD_CXXFLAGS = @ADD_CXXFLAGS@
     
    199198EXEEXT = @EXEEXT@
    200199F77 = @F77@
    201 FADDLIBS = @FADDLIBS@
    202200FFLAGS = @FFLAGS@
    203201HAVE_EXTERNALS_FALSE = @HAVE_EXTERNALS_FALSE@
     
    260258PACKAGE_VERSION = @PACKAGE_VERSION@
    261259PATH_SEPARATOR = @PATH_SEPARATOR@
    262 PCADDLIBS = @PCADDLIBS@
    263260PKG_CONFIG = @PKG_CONFIG@
    264261RANLIB = @RANLIB@
  • trunk/Clp/src/OsiClp/Makefile.in

    r1655 r1657  
    9595ABSBUILDDIR = @ABSBUILDDIR@
    9696ACLOCAL = @ACLOCAL@
    97 ADDLIBS = @ADDLIBS@
    9897ADD_CFLAGS = @ADD_CFLAGS@
    9998ADD_CXXFLAGS = @ADD_CXXFLAGS@
     
    166165EXEEXT = @EXEEXT@
    167166F77 = @F77@
    168 FADDLIBS = @FADDLIBS@
    169167FFLAGS = @FFLAGS@
    170168HAVE_EXTERNALS_FALSE = @HAVE_EXTERNALS_FALSE@
     
    227225PACKAGE_VERSION = @PACKAGE_VERSION@
    228226PATH_SEPARATOR = @PATH_SEPARATOR@
    229 PCADDLIBS = @PCADDLIBS@
    230227PKG_CONFIG = @PKG_CONFIG@
    231228RANLIB = @RANLIB@
  • trunk/Clp/src/OsiClp/osi-clp-uninstalled.pc.in

    r1644 r1657  
    44Name: OsiClp
    55Description: COIN-OR Open Solver Interface for CLP
     6URL: https://projects.coin-or.org/Osi
    67Version: @PACKAGE_VERSION@
    78Libs: ${libdir}/libOsiClp.la @OSICLPLIB_PCLIBS@
  • trunk/Clp/src/OsiClp/osi-clp.pc.in

    r1603 r1657  
    66Name: OsiClp
    77Description: COIN-OR Open Solver Interface for CLP
     8URL: https://projects.coin-or.org/Osi
    89Version: @PACKAGE_VERSION@
    910Libs: -L${libdir} -lOsiClp @OSICLPLIB_PCLIBS@
  • trunk/Clp/test/Makefile.in

    r1655 r1657  
    8484ABSBUILDDIR = @ABSBUILDDIR@
    8585ACLOCAL = @ACLOCAL@
    86 ADDLIBS = @ADDLIBS@
    8786ADD_CFLAGS = @ADD_CFLAGS@
    8887ADD_CXXFLAGS = @ADD_CXXFLAGS@
     
    155154EXEEXT = @EXEEXT@
    156155F77 = @F77@
    157 FADDLIBS = @FADDLIBS@
    158156FFLAGS = @FFLAGS@
    159157HAVE_EXTERNALS_FALSE = @HAVE_EXTERNALS_FALSE@
     
    216214PACKAGE_VERSION = @PACKAGE_VERSION@
    217215PATH_SEPARATOR = @PATH_SEPARATOR@
    218 PCADDLIBS = @PCADDLIBS@
    219216PKG_CONFIG = @PKG_CONFIG@
    220217RANLIB = @RANLIB@
Note: See TracChangeset for help on using the changeset viewer.