Changeset 1619


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

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

Location:
ThirdParty/HSL/trunk
Files:
4 edited

Legend:

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

    r1586 r1619  
    241241PACKAGE_VERSION = @PACKAGE_VERSION@
    242242PATH_SEPARATOR = @PATH_SEPARATOR@
     243PCADDLIBS = @PCADDLIBS@
    243244PKG_CONFIG = @PKG_CONFIG@
    244245RANLIB = @RANLIB@
  • ThirdParty/HSL/trunk/coinhsl-uninstalled.pc.in

    r1548 r1619  
    55Description: Harwell Subroutines Library
    66Version: @PACKAGE_VERSION@
    7 Libs: -L${libdir} -lcoinhsl @ADDLIBS@
     7Libs: -L${libdir} -lcoinhsl @PCADDLIBS@
    88Cflags: @HAVE_MXXX_CFLAGS@
  • ThirdParty/HSL/trunk/coinhsl.pc.in

    r1548 r1619  
    66Description: Harwell Subroutines Library
    77Version: @PACKAGE_VERSION@
    8 Libs: -L${libdir} -lcoinhsl @ADDLIBS@
     8Libs: -L${libdir} -lcoinhsl @PCADDLIBS@
    99Cflags: @HAVE_MXXX_CFLAGS@
  • ThirdParty/HSL/trunk/configure

    r1604 r1619  
    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 HSL_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 ADD_FFLAGS DBG_FFLAGS OPT_FFLAGS F77 FFLAGS ac_ct_F77 MPIF77 PKG_CONFIG ac_pt_PKG_CONFIG COIN_HAS_PKGCONFIG_TRUE COIN_HAS_PKGCONFIG_FALSE COIN_PKG_CONFIG_PATH FLIBS EGREP FC FCFLAGS ac_ct_FC 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 LIBTOOL ac_c_preproc_warn_flag ac_cxx_preproc_warn_flag RPATH_FLAGS LT_LDFLAGS COIN_HAS_MA27_TRUE COIN_HAS_MA27_FALSE COIN_HAS_MC19_TRUE COIN_HAS_MC19_FALSE COIN_HAS_MA57_TRUE COIN_HAS_MA57_FALSE COIN_HAS_MA28_TRUE COIN_HAS_MA28_FALSE COIN_HAS_MA77_TRUE COIN_HAS_MA77_FALSE HAVE_MXXX_CFLAGS F77_SHARED_CMD F77_DLL_LINKFLAGS HSL_SHARED_LIB EXPORT_SYMBOLS DEFFILE INSTALL_LOADABLE_LIBRARY_TRUE INSTALL_LOADABLE_LIBRARY_FALSE NEED_DEFFILE_TRUE NEED_DEFFILE_FALSE EXTRA_SHARED_COMMAND_TRUE EXTRA_SHARED_COMMAND_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 ADDLIBS PCADDLIBS FADDLIBS ALWAYS_FALSE_TRUE ALWAYS_FALSE_FALSE have_svnversion HSL_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 ADD_FFLAGS DBG_FFLAGS OPT_FFLAGS F77 FFLAGS ac_ct_F77 MPIF77 PKG_CONFIG ac_pt_PKG_CONFIG COIN_HAS_PKGCONFIG_TRUE COIN_HAS_PKGCONFIG_FALSE COIN_PKG_CONFIG_PATH FLIBS EGREP FC FCFLAGS ac_ct_FC 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 LIBTOOL ac_c_preproc_warn_flag ac_cxx_preproc_warn_flag RPATH_FLAGS LT_LDFLAGS COIN_HAS_MA27_TRUE COIN_HAS_MA27_FALSE COIN_HAS_MC19_TRUE COIN_HAS_MC19_FALSE COIN_HAS_MA57_TRUE COIN_HAS_MA57_FALSE COIN_HAS_MA28_TRUE COIN_HAS_MA28_FALSE COIN_HAS_MA77_TRUE COIN_HAS_MA77_FALSE HAVE_MXXX_CFLAGS F77_SHARED_CMD F77_DLL_LINKFLAGS HSL_SHARED_LIB EXPORT_SYMBOLS DEFFILE INSTALL_LOADABLE_LIBRARY_TRUE INSTALL_LOADABLE_LIBRARY_FALSE NEED_DEFFILE_TRUE NEED_DEFFILE_FALSE EXTRA_SHARED_COMMAND_TRUE EXTRA_SHARED_COMMAND_FALSE LIBEXT VPATH_DISTCLEANFILES ABSBUILDDIR LIBOBJS LTLIBOBJS'
    476476ac_subst_files=''
    477477
     
    16181618
    16191619
     1620# Initialize the PCADDLIBS variable.
     1621# This variable is used to setup library flags for the "Libs:" section in a .pc file.
     1622# In certain cases, it may contain more flags than the ADDLIBS variable.
     1623PCADDLIBS=""
     1624
     1625
    16201626# As backup, we make sure we don't loose an FLIBS if it has been set
    16211627# by the user
     
    33803386
    33813387# Provide some information about the compiler.
    3382 echo "$as_me:3382:" \
     3388echo "$as_me:3388:" \
    33833389     "checking for Fortran 77 compiler version" >&5
    33843390ac_compiler=`set X $ac_compile; echo $2`
     
    41334139ac_save_FFLAGS=$FFLAGS
    41344140FFLAGS="$FFLAGS $ac_verb"
    4135 (eval echo $as_me:4135: \"$ac_link\") >&5
     4141(eval echo $as_me:4141: \"$ac_link\") >&5
    41364142ac_f77_v_output=`eval $ac_link 5>&1 2>&1 | grep -v 'Driving:'`
    41374143echo "$ac_f77_v_output" >&5
     
    42114217ac_save_FFLAGS=$FFLAGS
    42124218FFLAGS="$FFLAGS $ac_cv_prog_f77_v"
    4213 (eval echo $as_me:4213: \"$ac_link\") >&5
     4219(eval echo $as_me:4219: \"$ac_link\") >&5
    42144220ac_f77_v_output=`eval $ac_link 5>&1 2>&1 | grep -v 'Driving:'`
    42154221echo "$ac_f77_v_output" >&5
     
    50835089
    50845090# Provide some information about the compiler.
    5085 echo "$as_me:5085:" \
     5091echo "$as_me:5091:" \
    50865092     "checking for Fortran compiler version" >&5
    50875093ac_compiler=`set X $ac_compile; echo $2`
     
    68496855*-*-irix6*)
    68506856  # Find out which ABI we are using.
    6851   echo '#line 6851 "configure"' > conftest.$ac_ext
     6857  echo '#line 6857 "configure"' > conftest.$ac_ext
    68526858  if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
    68536859  (eval $ac_compile) 2>&5
     
    93269332   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    93279333   -e 's:$: $lt_compiler_flag:'`
    9328    (eval echo "\"\$as_me:9328: $lt_compile\"" >&5)
     9334   (eval echo "\"\$as_me:9334: $lt_compile\"" >&5)
    93299335   (eval "$lt_compile" 2>conftest.err)
    93309336   ac_status=$?
    93319337   cat conftest.err >&5
    9332    echo "$as_me:9332: \$? = $ac_status" >&5
     9338   echo "$as_me:9338: \$? = $ac_status" >&5
    93339339   if (exit $ac_status) && test -s "$ac_outfile"; then
    93349340     # The compiler can only warn and ignore the option if not recognized
     
    95949600   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    95959601   -e 's:$: $lt_compiler_flag:'`
    9596    (eval echo "\"\$as_me:9596: $lt_compile\"" >&5)
     9602   (eval echo "\"\$as_me:9602: $lt_compile\"" >&5)
    95979603   (eval "$lt_compile" 2>conftest.err)
    95989604   ac_status=$?
    95999605   cat conftest.err >&5
    9600    echo "$as_me:9600: \$? = $ac_status" >&5
     9606   echo "$as_me:9606: \$? = $ac_status" >&5
    96019607   if (exit $ac_status) && test -s "$ac_outfile"; then
    96029608     # The compiler can only warn and ignore the option if not recognized
     
    96989704   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    96999705   -e 's:$: $lt_compiler_flag:'`
    9700    (eval echo "\"\$as_me:9700: $lt_compile\"" >&5)
     9706   (eval echo "\"\$as_me:9706: $lt_compile\"" >&5)
    97019707   (eval "$lt_compile" 2>out/conftest.err)
    97029708   ac_status=$?
    97039709   cat out/conftest.err >&5
    9704    echo "$as_me:9704: \$? = $ac_status" >&5
     9710   echo "$as_me:9710: \$? = $ac_status" >&5
    97059711   if (exit $ac_status) && test -s out/conftest2.$ac_objext
    97069712   then
     
    1211512121  lt_status=$lt_dlunknown
    1211612122  cat > conftest.$ac_ext <<EOF
    12117 #line 12117 "configure"
     12123#line 12123 "configure"
    1211812124#include "confdefs.h"
    1211912125
     
    1221512221  lt_status=$lt_dlunknown
    1221612222  cat > conftest.$ac_ext <<EOF
    12217 #line 12217 "configure"
     12223#line 12223 "configure"
    1221812224#include "confdefs.h"
    1221912225
     
    1457514581   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1457614582   -e 's:$: $lt_compiler_flag:'`
    14577    (eval echo "\"\$as_me:14577: $lt_compile\"" >&5)
     14583   (eval echo "\"\$as_me:14583: $lt_compile\"" >&5)
    1457814584   (eval "$lt_compile" 2>conftest.err)
    1457914585   ac_status=$?
    1458014586   cat conftest.err >&5
    14581    echo "$as_me:14581: \$? = $ac_status" >&5
     14587   echo "$as_me:14587: \$? = $ac_status" >&5
    1458214588   if (exit $ac_status) && test -s "$ac_outfile"; then
    1458314589     # The compiler can only warn and ignore the option if not recognized
     
    1467914685   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1468014686   -e 's:$: $lt_compiler_flag:'`
    14681    (eval echo "\"\$as_me:14681: $lt_compile\"" >&5)
     14687   (eval echo "\"\$as_me:14687: $lt_compile\"" >&5)
    1468214688   (eval "$lt_compile" 2>out/conftest.err)
    1468314689   ac_status=$?
    1468414690   cat out/conftest.err >&5
    14685    echo "$as_me:14685: \$? = $ac_status" >&5
     14691   echo "$as_me:14691: \$? = $ac_status" >&5
    1468614692   if (exit $ac_status) && test -s out/conftest2.$ac_objext
    1468714693   then
     
    1624916255   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1625016256   -e 's:$: $lt_compiler_flag:'`
    16251    (eval echo "\"\$as_me:16251: $lt_compile\"" >&5)
     16257   (eval echo "\"\$as_me:16257: $lt_compile\"" >&5)
    1625216258   (eval "$lt_compile" 2>conftest.err)
    1625316259   ac_status=$?
    1625416260   cat conftest.err >&5
    16255    echo "$as_me:16255: \$? = $ac_status" >&5
     16261   echo "$as_me:16261: \$? = $ac_status" >&5
    1625616262   if (exit $ac_status) && test -s "$ac_outfile"; then
    1625716263     # The compiler can only warn and ignore the option if not recognized
     
    1635316359   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1635416360   -e 's:$: $lt_compiler_flag:'`
    16355    (eval echo "\"\$as_me:16355: $lt_compile\"" >&5)
     16361   (eval echo "\"\$as_me:16361: $lt_compile\"" >&5)
    1635616362   (eval "$lt_compile" 2>out/conftest.err)
    1635716363   ac_status=$?
    1635816364   cat out/conftest.err >&5
    16359    echo "$as_me:16359: \$? = $ac_status" >&5
     16365   echo "$as_me:16365: \$? = $ac_status" >&5
    1636016366   if (exit $ac_status) && test -s out/conftest2.$ac_objext
    1636116367   then
     
    1856018566   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1856118567   -e 's:$: $lt_compiler_flag:'`
    18562    (eval echo "\"\$as_me:18562: $lt_compile\"" >&5)
     18568   (eval echo "\"\$as_me:18568: $lt_compile\"" >&5)
    1856318569   (eval "$lt_compile" 2>conftest.err)
    1856418570   ac_status=$?
    1856518571   cat conftest.err >&5
    18566    echo "$as_me:18566: \$? = $ac_status" >&5
     18572   echo "$as_me:18572: \$? = $ac_status" >&5
    1856718573   if (exit $ac_status) && test -s "$ac_outfile"; then
    1856818574     # The compiler can only warn and ignore the option if not recognized
     
    1882818834   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1882918835   -e 's:$: $lt_compiler_flag:'`
    18830    (eval echo "\"\$as_me:18830: $lt_compile\"" >&5)
     18836   (eval echo "\"\$as_me:18836: $lt_compile\"" >&5)
    1883118837   (eval "$lt_compile" 2>conftest.err)
    1883218838   ac_status=$?
    1883318839   cat conftest.err >&5
    18834    echo "$as_me:18834: \$? = $ac_status" >&5
     18840   echo "$as_me:18840: \$? = $ac_status" >&5
    1883518841   if (exit $ac_status) && test -s "$ac_outfile"; then
    1883618842     # The compiler can only warn and ignore the option if not recognized
     
    1893218938   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1893318939   -e 's:$: $lt_compiler_flag:'`
    18934    (eval echo "\"\$as_me:18934: $lt_compile\"" >&5)
     18940   (eval echo "\"\$as_me:18940: $lt_compile\"" >&5)
    1893518941   (eval "$lt_compile" 2>out/conftest.err)
    1893618942   ac_status=$?
    1893718943   cat out/conftest.err >&5
    18938    echo "$as_me:18938: \$? = $ac_status" >&5
     18944   echo "$as_me:18944: \$? = $ac_status" >&5
    1893918945   if (exit $ac_status) && test -s out/conftest2.$ac_objext
    1894018946   then
     
    2215922165    ADDLIBS="$ADDLIBS $FLIBS"
    2216022166  fi
     22167  PCADDLIBS="$PCADDLIBS $ADDLIBS"
    2216122168
    2216222169  # library extension
     
    2295622963s,@LIBS@,$LIBS,;t t
    2295722964s,@ADDLIBS@,$ADDLIBS,;t t
     22965s,@PCADDLIBS@,$PCADDLIBS,;t t
    2295822966s,@FADDLIBS@,$FADDLIBS,;t t
    2295922967s,@ALWAYS_FALSE_TRUE@,$ALWAYS_FALSE_TRUE,;t t
Note: See TracChangeset for help on using the changeset viewer.