Changeset 1615 for ThirdParty/ASL


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

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

Location:
ThirdParty/ASL/trunk
Files:
4 edited

Legend:

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

    r1582 r1615  
    179179PACKAGE_VERSION = @PACKAGE_VERSION@
    180180PATH_SEPARATOR = @PATH_SEPARATOR@
     181PCADDLIBS = @PCADDLIBS@
    181182PKG_CONFIG = @PKG_CONFIG@
    182183RANLIB = @RANLIB@
  • ThirdParty/ASL/trunk/coinasl-uninstalled.pc.in

    r1548 r1615  
    55Description: AMPL Solver Library
    66Version: @PACKAGE_VERSION@
    7 Libs: @ABSPATH_AMPLSOLVER_UNINSTALLED@ @ADDLIBS@
     7Libs: @ABSPATH_AMPLSOLVER_UNINSTALLED@ @PCADDLIBS@
    88Cflags: -I@ABSBUILDDIR@ -I@abs_source_dir@/solvers
  • ThirdParty/ASL/trunk/coinasl.pc.in

    r1548 r1615  
    77Description: AMPL Solver Library
    88Version: @PACKAGE_VERSION@
    9 Libs: @ABSPATH_AMPLSOLVER_INSTALLED@ @ADDLIBS@
     9Libs: @ABSPATH_AMPLSOLVER_INSTALLED@ @PCADDLIBS@
    1010Cflags: -I${includedir}
  • ThirdParty/ASL/trunk/configure

    r1601 r1615  
    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 ASL_SVN_REV EGREP LN_S CDEFS ADD_CFLAGS DBG_CFLAGS OPT_CFLAGS sol_cc_compiler CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT MPICC 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 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 PKG_CONFIG ac_pt_PKG_CONFIG COIN_HAS_PKGCONFIG_TRUE COIN_HAS_PKGCONFIG_FALSE COIN_PKG_CONFIG_PATH AMPLSOLVER_A ABSPATH_AMPLSOLVER_INSTALLED ABSPATH_AMPLSOLVER_UNINSTALLED ASLMAKEFLAGS MSVC_COMPILE_TRUE MSVC_COMPILE_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 ASL_SVN_REV EGREP LN_S CDEFS ADD_CFLAGS DBG_CFLAGS OPT_CFLAGS sol_cc_compiler CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT MPICC 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 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 PKG_CONFIG ac_pt_PKG_CONFIG COIN_HAS_PKGCONFIG_TRUE COIN_HAS_PKGCONFIG_FALSE COIN_PKG_CONFIG_PATH AMPLSOLVER_A ABSPATH_AMPLSOLVER_INSTALLED ABSPATH_AMPLSOLVER_UNINSTALLED ASLMAKEFLAGS MSVC_COMPILE_TRUE MSVC_COMPILE_FALSE LIBEXT VPATH_DISTCLEANFILES ABSBUILDDIR LIBOBJS LTLIBOBJS'
    476476ac_subst_files=''
    477477
     
    16551655
    16561656
     1657# Initialize the PCADDLIBS variable.
     1658# This variable is used to setup library flags for the "Libs:" section in a .pc file.
     1659# In certain cases, it may contain more flags than the ADDLIBS variable.
     1660PCADDLIBS=""
     1661
     1662
    16571663# As backup, we make sure we don't loose an FLIBS if it has been set
    16581664# by the user
     
    48014807*-*-irix6*)
    48024808  # Find out which ABI we are using.
    4803   echo '#line 4803 "configure"' > conftest.$ac_ext
     4809  echo '#line 4809 "configure"' > conftest.$ac_ext
    48044810  if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
    48054811  (eval $ac_compile) 2>&5
     
    64006406
    64016407# Provide some information about the compiler.
    6402 echo "$as_me:6402:" \
     6408echo "$as_me:6408:" \
    64036409     "checking for Fortran 77 compiler version" >&5
    64046410ac_compiler=`set X $ac_compile; echo $2`
     
    74677473   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    74687474   -e 's:$: $lt_compiler_flag:'`
    7469    (eval echo "\"\$as_me:7469: $lt_compile\"" >&5)
     7475   (eval echo "\"\$as_me:7475: $lt_compile\"" >&5)
    74707476   (eval "$lt_compile" 2>conftest.err)
    74717477   ac_status=$?
    74727478   cat conftest.err >&5
    7473    echo "$as_me:7473: \$? = $ac_status" >&5
     7479   echo "$as_me:7479: \$? = $ac_status" >&5
    74747480   if (exit $ac_status) && test -s "$ac_outfile"; then
    74757481     # The compiler can only warn and ignore the option if not recognized
     
    77357741   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    77367742   -e 's:$: $lt_compiler_flag:'`
    7737    (eval echo "\"\$as_me:7737: $lt_compile\"" >&5)
     7743   (eval echo "\"\$as_me:7743: $lt_compile\"" >&5)
    77387744   (eval "$lt_compile" 2>conftest.err)
    77397745   ac_status=$?
    77407746   cat conftest.err >&5
    7741    echo "$as_me:7741: \$? = $ac_status" >&5
     7747   echo "$as_me:7747: \$? = $ac_status" >&5
    77427748   if (exit $ac_status) && test -s "$ac_outfile"; then
    77437749     # The compiler can only warn and ignore the option if not recognized
     
    78397845   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    78407846   -e 's:$: $lt_compiler_flag:'`
    7841    (eval echo "\"\$as_me:7841: $lt_compile\"" >&5)
     7847   (eval echo "\"\$as_me:7847: $lt_compile\"" >&5)
    78427848   (eval "$lt_compile" 2>out/conftest.err)
    78437849   ac_status=$?
    78447850   cat out/conftest.err >&5
    7845    echo "$as_me:7845: \$? = $ac_status" >&5
     7851   echo "$as_me:7851: \$? = $ac_status" >&5
    78467852   if (exit $ac_status) && test -s out/conftest2.$ac_objext
    78477853   then
     
    1018410190  lt_status=$lt_dlunknown
    1018510191  cat > conftest.$ac_ext <<EOF
    10186 #line 10186 "configure"
     10192#line 10192 "configure"
    1018710193#include "confdefs.h"
    1018810194
     
    1028410290  lt_status=$lt_dlunknown
    1028510291  cat > conftest.$ac_ext <<EOF
    10286 #line 10286 "configure"
     10292#line 10292 "configure"
    1028710293#include "confdefs.h"
    1028810294
     
    1262812634   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1262912635   -e 's:$: $lt_compiler_flag:'`
    12630    (eval echo "\"\$as_me:12630: $lt_compile\"" >&5)
     12636   (eval echo "\"\$as_me:12636: $lt_compile\"" >&5)
    1263112637   (eval "$lt_compile" 2>conftest.err)
    1263212638   ac_status=$?
    1263312639   cat conftest.err >&5
    12634    echo "$as_me:12634: \$? = $ac_status" >&5
     12640   echo "$as_me:12640: \$? = $ac_status" >&5
    1263512641   if (exit $ac_status) && test -s "$ac_outfile"; then
    1263612642     # The compiler can only warn and ignore the option if not recognized
     
    1273212738   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1273312739   -e 's:$: $lt_compiler_flag:'`
    12734    (eval echo "\"\$as_me:12734: $lt_compile\"" >&5)
     12740   (eval echo "\"\$as_me:12740: $lt_compile\"" >&5)
    1273512741   (eval "$lt_compile" 2>out/conftest.err)
    1273612742   ac_status=$?
    1273712743   cat out/conftest.err >&5
    12738    echo "$as_me:12738: \$? = $ac_status" >&5
     12744   echo "$as_me:12744: \$? = $ac_status" >&5
    1273912745   if (exit $ac_status) && test -s out/conftest2.$ac_objext
    1274012746   then
     
    1430214308   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1430314309   -e 's:$: $lt_compiler_flag:'`
    14304    (eval echo "\"\$as_me:14304: $lt_compile\"" >&5)
     14310   (eval echo "\"\$as_me:14310: $lt_compile\"" >&5)
    1430514311   (eval "$lt_compile" 2>conftest.err)
    1430614312   ac_status=$?
    1430714313   cat conftest.err >&5
    14308    echo "$as_me:14308: \$? = $ac_status" >&5
     14314   echo "$as_me:14314: \$? = $ac_status" >&5
    1430914315   if (exit $ac_status) && test -s "$ac_outfile"; then
    1431014316     # The compiler can only warn and ignore the option if not recognized
     
    1440614412   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1440714413   -e 's:$: $lt_compiler_flag:'`
    14408    (eval echo "\"\$as_me:14408: $lt_compile\"" >&5)
     14414   (eval echo "\"\$as_me:14414: $lt_compile\"" >&5)
    1440914415   (eval "$lt_compile" 2>out/conftest.err)
    1441014416   ac_status=$?
    1441114417   cat out/conftest.err >&5
    14412    echo "$as_me:14412: \$? = $ac_status" >&5
     14418   echo "$as_me:14418: \$? = $ac_status" >&5
    1441314419   if (exit $ac_status) && test -s out/conftest2.$ac_objext
    1441414420   then
     
    1661316619   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1661416620   -e 's:$: $lt_compiler_flag:'`
    16615    (eval echo "\"\$as_me:16615: $lt_compile\"" >&5)
     16621   (eval echo "\"\$as_me:16621: $lt_compile\"" >&5)
    1661616622   (eval "$lt_compile" 2>conftest.err)
    1661716623   ac_status=$?
    1661816624   cat conftest.err >&5
    16619    echo "$as_me:16619: \$? = $ac_status" >&5
     16625   echo "$as_me:16625: \$? = $ac_status" >&5
    1662016626   if (exit $ac_status) && test -s "$ac_outfile"; then
    1662116627     # The compiler can only warn and ignore the option if not recognized
     
    1688116887   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1688216888   -e 's:$: $lt_compiler_flag:'`
    16883    (eval echo "\"\$as_me:16883: $lt_compile\"" >&5)
     16889   (eval echo "\"\$as_me:16889: $lt_compile\"" >&5)
    1688416890   (eval "$lt_compile" 2>conftest.err)
    1688516891   ac_status=$?
    1688616892   cat conftest.err >&5
    16887    echo "$as_me:16887: \$? = $ac_status" >&5
     16893   echo "$as_me:16893: \$? = $ac_status" >&5
    1688816894   if (exit $ac_status) && test -s "$ac_outfile"; then
    1688916895     # The compiler can only warn and ignore the option if not recognized
     
    1698516991   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1698616992   -e 's:$: $lt_compiler_flag:'`
    16987    (eval echo "\"\$as_me:16987: $lt_compile\"" >&5)
     16993   (eval echo "\"\$as_me:16993: $lt_compile\"" >&5)
    1698816994   (eval "$lt_compile" 2>out/conftest.err)
    1698916995   ac_status=$?
    1699016996   cat out/conftest.err >&5
    16991    echo "$as_me:16991: \$? = $ac_status" >&5
     16997   echo "$as_me:16997: \$? = $ac_status" >&5
    1699216998   if (exit $ac_status) && test -s out/conftest2.$ac_objext
    1699316999   then
     
    2035520361    ADDLIBS="$ADDLIBS $FLIBS"
    2035620362  fi
     20363  PCADDLIBS="$PCADDLIBS $ADDLIBS"
    2035720364
    2035820365  # library extension
     
    2110921116s,@build_os@,$build_os,;t t
    2111021117s,@ADDLIBS@,$ADDLIBS,;t t
     21118s,@PCADDLIBS@,$PCADDLIBS,;t t
    2111121119s,@FADDLIBS@,$FADDLIBS,;t t
    2111221120s,@ALWAYS_FALSE_TRUE@,$ALWAYS_FALSE_TRUE,;t t
Note: See TracChangeset for help on using the changeset viewer.