Changeset 1617


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

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

Location:
ThirdParty/Lapack/trunk
Files:
4 edited

Legend:

Unmodified
Added
Removed

  • ThirdParty/Lapack/trunk/Makefile.in

    r1587 r1617  
    197197PACKAGE_VERSION = @PACKAGE_VERSION@
    198198PATH_SEPARATOR = @PATH_SEPARATOR@
     199PCADDLIBS = @PCADDLIBS@
    199200PKG_CONFIG = @PKG_CONFIG@
    200201RANLIB = @RANLIB@

  • ThirdParty/Lapack/trunk/coinlapack-uninstalled.pc.in

    r1548 r1617  
    55Description: Linear algebra package
    66Version: @PACKAGE_VERSION@
    7 Libs: -L${libdir} -lcoinlapack @ADDLIBS@
     7Libs: -L${libdir} -lcoinlapack @PCADDLIBS@
    88Cflags:

  • ThirdParty/Lapack/trunk/coinlapack.pc.in

    r1548 r1617  
    66Description: Linear algebra package
    77Version: @PACKAGE_VERSION@
    8 Libs: -L${libdir} -lcoinlapack @ADDLIBS@
     8Libs: -L${libdir} -lcoinlapack @PCADDLIBS@
    99Cflags:

  • ThirdParty/Lapack/trunk/configure

    r1605 r1617  
    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 LAPACK_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 FLIBS PKG_CONFIG ac_pt_PKG_CONFIG COIN_HAS_PKGCONFIG_TRUE COIN_HAS_PKGCONFIG_FALSE COIN_PKG_CONFIG_PATH DLAMCH_FFLAGS 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 LIBTOOL ac_c_preproc_warn_flag ac_cxx_preproc_warn_flag RPATH_FLAGS LT_LDFLAGS 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 LAPACK_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 FLIBS PKG_CONFIG ac_pt_PKG_CONFIG COIN_HAS_PKGCONFIG_TRUE COIN_HAS_PKGCONFIG_FALSE COIN_PKG_CONFIG_PATH DLAMCH_FFLAGS 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 LIBTOOL ac_c_preproc_warn_flag ac_cxx_preproc_warn_flag RPATH_FLAGS LT_LDFLAGS LIBEXT VPATH_DISTCLEANFILES ABSBUILDDIR LIBOBJS LTLIBOBJS'
    476476ac_subst_files=''
    477477
    … …  
    16111611
    16121612
     1613# Initialize the PCADDLIBS variable.
     1614# This variable is used to setup library flags for the "Libs:" section in a .pc file.
     1615# In certain cases, it may contain more flags than the ADDLIBS variable.
     1616PCADDLIBS=""
     1617
     1618
    16131619# As backup, we make sure we don't loose an FLIBS if it has been set
    16141620# by the user
    … …  
    33643370
    33653371# Provide some information about the compiler.
    3366 echo "$as_me:3366:" \
     3372echo "$as_me:3372:" \
    33673373     "checking for Fortran 77 compiler version" >&5
    33683374ac_compiler=`set X $ac_compile; echo $2`
    … …  
    39323938ac_save_FFLAGS=$FFLAGS
    39333939FFLAGS="$FFLAGS $ac_verb"
    3934 (eval echo $as_me:3934: \"$ac_link\") >&5
     3940(eval echo $as_me:3940: \"$ac_link\") >&5
    39353941ac_f77_v_output=`eval $ac_link 5>&1 2>&1 | grep -v 'Driving:'`
    39363942echo "$ac_f77_v_output" >&5
    … …  
    40104016ac_save_FFLAGS=$FFLAGS
    40114017FFLAGS="$FFLAGS $ac_cv_prog_f77_v"
    4012 (eval echo $as_me:4012: \"$ac_link\") >&5
     4018(eval echo $as_me:4018: \"$ac_link\") >&5
    40134019ac_f77_v_output=`eval $ac_link 5>&1 2>&1 | grep -v 'Driving:'`
    40144020echo "$ac_f77_v_output" >&5
    … …  
    66146620*-*-irix6*)
    66156621  # Find out which ABI we are using.
    6616   echo '#line 6616 "configure"' > conftest.$ac_ext
     6622  echo '#line 6622 "configure"' > conftest.$ac_ext
    66176623  if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
    66186624  (eval $ac_compile) 2>&5
    … …  
    90919097   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    90929098   -e 's:$: $lt_compiler_flag:'`
    9093    (eval echo "\"\$as_me:9093: $lt_compile\"" >&5)
     9099   (eval echo "\"\$as_me:9099: $lt_compile\"" >&5)
    90949100   (eval "$lt_compile" 2>conftest.err)
    90959101   ac_status=$?
    90969102   cat conftest.err >&5
    9097    echo "$as_me:9097: \$? = $ac_status" >&5
     9103   echo "$as_me:9103: \$? = $ac_status" >&5
    90989104   if (exit $ac_status) && test -s "$ac_outfile"; then
    90999105     # The compiler can only warn and ignore the option if not recognized
    … …  
    93599365   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    93609366   -e 's:$: $lt_compiler_flag:'`
    9361    (eval echo "\"\$as_me:9361: $lt_compile\"" >&5)
     9367   (eval echo "\"\$as_me:9367: $lt_compile\"" >&5)
    93629368   (eval "$lt_compile" 2>conftest.err)
    93639369   ac_status=$?
    93649370   cat conftest.err >&5
    9365    echo "$as_me:9365: \$? = $ac_status" >&5
     9371   echo "$as_me:9371: \$? = $ac_status" >&5
    93669372   if (exit $ac_status) && test -s "$ac_outfile"; then
    93679373     # The compiler can only warn and ignore the option if not recognized
    … …  
    94639469   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    94649470   -e 's:$: $lt_compiler_flag:'`
    9465    (eval echo "\"\$as_me:9465: $lt_compile\"" >&5)
     9471   (eval echo "\"\$as_me:9471: $lt_compile\"" >&5)
    94669472   (eval "$lt_compile" 2>out/conftest.err)
    94679473   ac_status=$?
    94689474   cat out/conftest.err >&5
    9469    echo "$as_me:9469: \$? = $ac_status" >&5
     9475   echo "$as_me:9475: \$? = $ac_status" >&5
    94709476   if (exit $ac_status) && test -s out/conftest2.$ac_objext
    94719477   then
    … …  
    1188011886  lt_status=$lt_dlunknown
    1188111887  cat > conftest.$ac_ext <<EOF
    11882 #line 11882 "configure"
     11888#line 11888 "configure"
    1188311889#include "confdefs.h"
    1188411890
    … …  
    1198011986  lt_status=$lt_dlunknown
    1198111987  cat > conftest.$ac_ext <<EOF
    11982 #line 11982 "configure"
     11988#line 11988 "configure"
    1198311989#include "confdefs.h"
    1198411990
    … …  
    1434014346   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1434114347   -e 's:$: $lt_compiler_flag:'`
    14342    (eval echo "\"\$as_me:14342: $lt_compile\"" >&5)
     14348   (eval echo "\"\$as_me:14348: $lt_compile\"" >&5)
    1434314349   (eval "$lt_compile" 2>conftest.err)
    1434414350   ac_status=$?
    1434514351   cat conftest.err >&5
    14346    echo "$as_me:14346: \$? = $ac_status" >&5
     14352   echo "$as_me:14352: \$? = $ac_status" >&5
    1434714353   if (exit $ac_status) && test -s "$ac_outfile"; then
    1434814354     # The compiler can only warn and ignore the option if not recognized
    … …  
    1444414450   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1444514451   -e 's:$: $lt_compiler_flag:'`
    14446    (eval echo "\"\$as_me:14446: $lt_compile\"" >&5)
     14452   (eval echo "\"\$as_me:14452: $lt_compile\"" >&5)
    1444714453   (eval "$lt_compile" 2>out/conftest.err)
    1444814454   ac_status=$?
    1444914455   cat out/conftest.err >&5
    14450    echo "$as_me:14450: \$? = $ac_status" >&5
     14456   echo "$as_me:14456: \$? = $ac_status" >&5
    1445114457   if (exit $ac_status) && test -s out/conftest2.$ac_objext
    1445214458   then
    … …  
    1601416020   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1601516021   -e 's:$: $lt_compiler_flag:'`
    16016    (eval echo "\"\$as_me:16016: $lt_compile\"" >&5)
     16022   (eval echo "\"\$as_me:16022: $lt_compile\"" >&5)
    1601716023   (eval "$lt_compile" 2>conftest.err)
    1601816024   ac_status=$?
    1601916025   cat conftest.err >&5
    16020    echo "$as_me:16020: \$? = $ac_status" >&5
     16026   echo "$as_me:16026: \$? = $ac_status" >&5
    1602116027   if (exit $ac_status) && test -s "$ac_outfile"; then
    1602216028     # The compiler can only warn and ignore the option if not recognized
    … …  
    1611816124   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1611916125   -e 's:$: $lt_compiler_flag:'`
    16120    (eval echo "\"\$as_me:16120: $lt_compile\"" >&5)
     16126   (eval echo "\"\$as_me:16126: $lt_compile\"" >&5)
    1612116127   (eval "$lt_compile" 2>out/conftest.err)
    1612216128   ac_status=$?
    1612316129   cat out/conftest.err >&5
    16124    echo "$as_me:16124: \$? = $ac_status" >&5
     16130   echo "$as_me:16130: \$? = $ac_status" >&5
    1612516131   if (exit $ac_status) && test -s out/conftest2.$ac_objext
    1612616132   then
    … …  
    1832518331   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1832618332   -e 's:$: $lt_compiler_flag:'`
    18327    (eval echo "\"\$as_me:18327: $lt_compile\"" >&5)
     18333   (eval echo "\"\$as_me:18333: $lt_compile\"" >&5)
    1832818334   (eval "$lt_compile" 2>conftest.err)
    1832918335   ac_status=$?
    1833018336   cat conftest.err >&5
    18331    echo "$as_me:18331: \$? = $ac_status" >&5
     18337   echo "$as_me:18337: \$? = $ac_status" >&5
    1833218338   if (exit $ac_status) && test -s "$ac_outfile"; then
    1833318339     # The compiler can only warn and ignore the option if not recognized
    … …  
    1859318599   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1859418600   -e 's:$: $lt_compiler_flag:'`
    18595    (eval echo "\"\$as_me:18595: $lt_compile\"" >&5)
     18601   (eval echo "\"\$as_me:18601: $lt_compile\"" >&5)
    1859618602   (eval "$lt_compile" 2>conftest.err)
    1859718603   ac_status=$?
    1859818604   cat conftest.err >&5
    18599    echo "$as_me:18599: \$? = $ac_status" >&5
     18605   echo "$as_me:18605: \$? = $ac_status" >&5
    1860018606   if (exit $ac_status) && test -s "$ac_outfile"; then
    1860118607     # The compiler can only warn and ignore the option if not recognized
    … …  
    1869718703   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1869818704   -e 's:$: $lt_compiler_flag:'`
    18699    (eval echo "\"\$as_me:18699: $lt_compile\"" >&5)
     18705   (eval echo "\"\$as_me:18705: $lt_compile\"" >&5)
    1870018706   (eval "$lt_compile" 2>out/conftest.err)
    1870118707   ac_status=$?
    1870218708   cat out/conftest.err >&5
    18703    echo "$as_me:18703: \$? = $ac_status" >&5
     18709   echo "$as_me:18709: \$? = $ac_status" >&5
    1870418710   if (exit $ac_status) && test -s out/conftest2.$ac_objext
    1870518711   then
    … …  
    2165821664    ADDLIBS="$ADDLIBS $FLIBS"
    2165921665  fi
     21666  PCADDLIBS="$PCADDLIBS $ADDLIBS"
    2166021667
    2166121668  # library extension
    … …  
    2240522412s,@LIBS@,$LIBS,;t t
    2240622413s,@ADDLIBS@,$ADDLIBS,;t t
     22414s,@PCADDLIBS@,$PCADDLIBS,;t t
    2240722415s,@FADDLIBS@,$FADDLIBS,;t t
    2240822416s,@ALWAYS_FALSE_TRUE@,$ALWAYS_FALSE_TRUE,;t t
Note: See TracChangeset for help on using the changeset viewer.