Changeset 1618


Ignore:
Timestamp:
Jul 18, 2010 11:11:17 AM (10 years ago)
Author:
stefan
Message:

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

Location:
ThirdParty/Glpk/trunk
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • ThirdParty/Glpk/trunk/Makefile.in

    r1585 r1618  
    213213PACKAGE_VERSION = @PACKAGE_VERSION@
    214214PATH_SEPARATOR = @PATH_SEPARATOR@
     215PCADDLIBS = @PCADDLIBS@
    215216PKG_CONFIG = @PKG_CONFIG@
    216217RANLIB = @RANLIB@
  • ThirdParty/Glpk/trunk/coinglpk-uninstalled.pc.in

    r1548 r1618  
    55Description: Gnu Linear Programming Kit
    66Version: @glpkmajorver@.@glpkminorver@
    7 Libs: -L${libdir} -lcoinglpk @ADDLIBS@
     7Libs: -L${libdir} -lcoinglpk @PCADDLIBS@
    88Cflags: -I@ABSBUILDDIR@ -I@abs_source_dir@/glpk/include
  • ThirdParty/Glpk/trunk/coinglpk.pc.in

    r1548 r1618  
    77Description: Gnu Linear Programming Kit
    88Version: @glpkmajorver@.@glpkminorver@
    9 Libs: -L${libdir} -lcoinglpk @ADDLIBS@
     9Libs: -L${libdir} -lcoinglpk @PCADDLIBS@
    1010Cflags: -I${includedir}
  • ThirdParty/Glpk/trunk/configure

    r1603 r1618  
    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 ADDLIBS FADDLIBS ALWAYS_FALSE_TRUE ALWAYS_FALSE_FALSE have_svnversion GLPK_SVN_REV build build_cpu build_vendor build_os CDEFS ADD_CFLAGS DBG_CFLAGS OPT_CFLAGS sol_cc_compiler CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT MPICC PKG_CONFIG ac_pt_PKG_CONFIG COIN_HAS_PKGCONFIG_TRUE COIN_HAS_PKGCONFIG_FALSE COIN_PKG_CONFIG_PATH 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 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 CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL ac_c_preproc_warn_flag ac_cxx_preproc_warn_flag RPATH_FLAGS LT_LDFLAGS glpkmajorver glpkminorver COIN_HAS_ZLIB_TRUE COIN_HAS_ZLIB_FALSE GLPKDIR 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 ADDLIBS PCADDLIBS FADDLIBS ALWAYS_FALSE_TRUE ALWAYS_FALSE_FALSE have_svnversion GLPK_SVN_REV build build_cpu build_vendor build_os CDEFS ADD_CFLAGS DBG_CFLAGS OPT_CFLAGS sol_cc_compiler CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT MPICC PKG_CONFIG ac_pt_PKG_CONFIG COIN_HAS_PKGCONFIG_TRUE COIN_HAS_PKGCONFIG_FALSE COIN_PKG_CONFIG_PATH 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 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 CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL ac_c_preproc_warn_flag ac_cxx_preproc_warn_flag RPATH_FLAGS LT_LDFLAGS glpkmajorver glpkminorver COIN_HAS_ZLIB_TRUE COIN_HAS_ZLIB_FALSE GLPKDIR LIBEXT VPATH_DISTCLEANFILES ABSBUILDDIR LIBOBJS LTLIBOBJS'
    476476ac_subst_files=''
    477477
     
    15871587
    15881588
     1589# Initialize the PCADDLIBS variable.
     1590# This variable is used to setup library flags for the "Libs:" section in a .pc file.
     1591# In certain cases, it may contain more flags than the ADDLIBS variable.
     1592PCADDLIBS=""
     1593
     1594
    15891595# As backup, we make sure we don't loose an FLIBS if it has been set
    15901596# by the user
     
    49794985*-*-irix6*)
    49804986  # Find out which ABI we are using.
    4981   echo '#line 4981 "configure"' > conftest.$ac_ext
     4987  echo '#line 4987 "configure"' > conftest.$ac_ext
    49824988  if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
    49834989  (eval $ac_compile) 2>&5
     
    65786584
    65796585# Provide some information about the compiler.
    6580 echo "$as_me:6580:" \
     6586echo "$as_me:6586:" \
    65816587     "checking for Fortran 77 compiler version" >&5
    65826588ac_compiler=`set X $ac_compile; echo $2`
     
    76457651   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    76467652   -e 's:$: $lt_compiler_flag:'`
    7647    (eval echo "\"\$as_me:7647: $lt_compile\"" >&5)
     7653   (eval echo "\"\$as_me:7653: $lt_compile\"" >&5)
    76487654   (eval "$lt_compile" 2>conftest.err)
    76497655   ac_status=$?
    76507656   cat conftest.err >&5
    7651    echo "$as_me:7651: \$? = $ac_status" >&5
     7657   echo "$as_me:7657: \$? = $ac_status" >&5
    76527658   if (exit $ac_status) && test -s "$ac_outfile"; then
    76537659     # The compiler can only warn and ignore the option if not recognized
     
    79137919   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    79147920   -e 's:$: $lt_compiler_flag:'`
    7915    (eval echo "\"\$as_me:7915: $lt_compile\"" >&5)
     7921   (eval echo "\"\$as_me:7921: $lt_compile\"" >&5)
    79167922   (eval "$lt_compile" 2>conftest.err)
    79177923   ac_status=$?
    79187924   cat conftest.err >&5
    7919    echo "$as_me:7919: \$? = $ac_status" >&5
     7925   echo "$as_me:7925: \$? = $ac_status" >&5
    79207926   if (exit $ac_status) && test -s "$ac_outfile"; then
    79217927     # The compiler can only warn and ignore the option if not recognized
     
    80178023   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    80188024   -e 's:$: $lt_compiler_flag:'`
    8019    (eval echo "\"\$as_me:8019: $lt_compile\"" >&5)
     8025   (eval echo "\"\$as_me:8025: $lt_compile\"" >&5)
    80208026   (eval "$lt_compile" 2>out/conftest.err)
    80218027   ac_status=$?
    80228028   cat out/conftest.err >&5
    8023    echo "$as_me:8023: \$? = $ac_status" >&5
     8029   echo "$as_me:8029: \$? = $ac_status" >&5
    80248030   if (exit $ac_status) && test -s out/conftest2.$ac_objext
    80258031   then
     
    1036210368  lt_status=$lt_dlunknown
    1036310369  cat > conftest.$ac_ext <<EOF
    10364 #line 10364 "configure"
     10370#line 10370 "configure"
    1036510371#include "confdefs.h"
    1036610372
     
    1046210468  lt_status=$lt_dlunknown
    1046310469  cat > conftest.$ac_ext <<EOF
    10464 #line 10464 "configure"
     10470#line 10470 "configure"
    1046510471#include "confdefs.h"
    1046610472
     
    1280612812   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1280712813   -e 's:$: $lt_compiler_flag:'`
    12808    (eval echo "\"\$as_me:12808: $lt_compile\"" >&5)
     12814   (eval echo "\"\$as_me:12814: $lt_compile\"" >&5)
    1280912815   (eval "$lt_compile" 2>conftest.err)
    1281012816   ac_status=$?
    1281112817   cat conftest.err >&5
    12812    echo "$as_me:12812: \$? = $ac_status" >&5
     12818   echo "$as_me:12818: \$? = $ac_status" >&5
    1281312819   if (exit $ac_status) && test -s "$ac_outfile"; then
    1281412820     # The compiler can only warn and ignore the option if not recognized
     
    1291012916   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1291112917   -e 's:$: $lt_compiler_flag:'`
    12912    (eval echo "\"\$as_me:12912: $lt_compile\"" >&5)
     12918   (eval echo "\"\$as_me:12918: $lt_compile\"" >&5)
    1291312919   (eval "$lt_compile" 2>out/conftest.err)
    1291412920   ac_status=$?
    1291512921   cat out/conftest.err >&5
    12916    echo "$as_me:12916: \$? = $ac_status" >&5
     12922   echo "$as_me:12922: \$? = $ac_status" >&5
    1291712923   if (exit $ac_status) && test -s out/conftest2.$ac_objext
    1291812924   then
     
    1448014486   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1448114487   -e 's:$: $lt_compiler_flag:'`
    14482    (eval echo "\"\$as_me:14482: $lt_compile\"" >&5)
     14488   (eval echo "\"\$as_me:14488: $lt_compile\"" >&5)
    1448314489   (eval "$lt_compile" 2>conftest.err)
    1448414490   ac_status=$?
    1448514491   cat conftest.err >&5
    14486    echo "$as_me:14486: \$? = $ac_status" >&5
     14492   echo "$as_me:14492: \$? = $ac_status" >&5
    1448714493   if (exit $ac_status) && test -s "$ac_outfile"; then
    1448814494     # The compiler can only warn and ignore the option if not recognized
     
    1458414590   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1458514591   -e 's:$: $lt_compiler_flag:'`
    14586    (eval echo "\"\$as_me:14586: $lt_compile\"" >&5)
     14592   (eval echo "\"\$as_me:14592: $lt_compile\"" >&5)
    1458714593   (eval "$lt_compile" 2>out/conftest.err)
    1458814594   ac_status=$?
    1458914595   cat out/conftest.err >&5
    14590    echo "$as_me:14590: \$? = $ac_status" >&5
     14596   echo "$as_me:14596: \$? = $ac_status" >&5
    1459114597   if (exit $ac_status) && test -s out/conftest2.$ac_objext
    1459214598   then
     
    1679116797   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1679216798   -e 's:$: $lt_compiler_flag:'`
    16793    (eval echo "\"\$as_me:16793: $lt_compile\"" >&5)
     16799   (eval echo "\"\$as_me:16799: $lt_compile\"" >&5)
    1679416800   (eval "$lt_compile" 2>conftest.err)
    1679516801   ac_status=$?
    1679616802   cat conftest.err >&5
    16797    echo "$as_me:16797: \$? = $ac_status" >&5
     16803   echo "$as_me:16803: \$? = $ac_status" >&5
    1679816804   if (exit $ac_status) && test -s "$ac_outfile"; then
    1679916805     # The compiler can only warn and ignore the option if not recognized
     
    1705917065   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1706017066   -e 's:$: $lt_compiler_flag:'`
    17061    (eval echo "\"\$as_me:17061: $lt_compile\"" >&5)
     17067   (eval echo "\"\$as_me:17067: $lt_compile\"" >&5)
    1706217068   (eval "$lt_compile" 2>conftest.err)
    1706317069   ac_status=$?
    1706417070   cat conftest.err >&5
    17065    echo "$as_me:17065: \$? = $ac_status" >&5
     17071   echo "$as_me:17071: \$? = $ac_status" >&5
    1706617072   if (exit $ac_status) && test -s "$ac_outfile"; then
    1706717073     # The compiler can only warn and ignore the option if not recognized
     
    1716317169   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1716417170   -e 's:$: $lt_compiler_flag:'`
    17165    (eval echo "\"\$as_me:17165: $lt_compile\"" >&5)
     17171   (eval echo "\"\$as_me:17171: $lt_compile\"" >&5)
    1716617172   (eval "$lt_compile" 2>out/conftest.err)
    1716717173   ac_status=$?
    1716817174   cat out/conftest.err >&5
    17169    echo "$as_me:17169: \$? = $ac_status" >&5
     17175   echo "$as_me:17175: \$? = $ac_status" >&5
    1717017176   if (exit $ac_status) && test -s out/conftest2.$ac_objext
    1717117177   then
     
    2217822184    ADDLIBS="$ADDLIBS $FLIBS"
    2217922185  fi
     22186  PCADDLIBS="$PCADDLIBS $ADDLIBS"
    2218022187
    2218122188  # library extension
     
    2290222909s,@LIBS@,$LIBS,;t t
    2290322910s,@ADDLIBS@,$ADDLIBS,;t t
     22911s,@PCADDLIBS@,$PCADDLIBS,;t t
    2290422912s,@FADDLIBS@,$FADDLIBS,;t t
    2290522913s,@ALWAYS_FALSE_TRUE@,$ALWAYS_FALSE_TRUE,;t t
Note: See TracChangeset for help on using the changeset viewer.