Changeset 2061


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

sync with trunk rev2060

Location:
ThirdParty/ASL/stable/1.2
Files:
5 edited

Legend:

Unmodified
Added
Removed
  • ThirdParty/ASL/stable/1.2

  • ThirdParty/ASL/stable/1.2/Makefile.in

    r2001 r2061  
    102102ABSBUILDDIR = @ABSBUILDDIR@
    103103ACLOCAL = @ACLOCAL@
    104 ADDLIBS = @ADDLIBS@
    105104ADD_CFLAGS = @ADD_CFLAGS@
    106105ALWAYS_FALSE_FALSE = @ALWAYS_FALSE_FALSE@
     
    147146EXEEXT = @EXEEXT@
    148147F77 = @F77@
    149 FADDLIBS = @FADDLIBS@
    150148FFLAGS = @FFLAGS@
    151149HAVE_EXTERNALS_FALSE = @HAVE_EXTERNALS_FALSE@
     
    180178PACKAGE_VERSION = @PACKAGE_VERSION@
    181179PATH_SEPARATOR = @PATH_SEPARATOR@
    182 PCADDLIBS = @PCADDLIBS@
    183180PKG_CONFIG = @PKG_CONFIG@
    184181RANLIB = @RANLIB@
  • ThirdParty/ASL/stable/1.2/coinasl-uninstalled.pc.in

    r1902 r2061  
    44Name: ASL
    55Description: AMPL Solver Library
     6URL: https://projects.coin-or.org/BuildTools
    67Version: @PACKAGE_VERSION@
    78Libs: ${libdir}/@AMPLSOLVER_A@ @ASL_PCLIBS@
  • ThirdParty/ASL/stable/1.2/coinasl.pc.in

    r2001 r2061  
    66Name: ASL
    77Description: AMPL Solver Library
     8URL: https://projects.coin-or.org/BuildTools
    89Version: @PACKAGE_VERSION@
    910Libs: -L${libdir} -lamplsolver @ASL_PCLIBS@
  • ThirdParty/ASL/stable/1.2/configure

    r2042 r2061  
    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 ASL_SVN_REV EGREP LN_S 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 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 COIN_PKG_CONFIG_PATH_UNINSTALLED AMPLSOLVER_A ASLMAKEFLAGS MSVC_COMPILE_TRUE MSVC_COMPILE_FALSE ASL_PCLIBS 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 ASL_SVN_REV EGREP LN_S 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 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 COIN_PKG_CONFIG_PATH_UNINSTALLED AMPLSOLVER_A ASLMAKEFLAGS MSVC_COMPILE_TRUE MSVC_COMPILE_FALSE ASL_PCLIBS LIBEXT VPATH_DISTCLEANFILES ABSBUILDDIR LIBOBJS LTLIBOBJS'
    476476ac_subst_files=''
    477477
     
    16511651
    16521652# A bit of initial setup.
    1653 # Initialize the ADDLIBS variable
    1654 ADDLIBS="-lm $LIBS"
    1655 
    1656 
    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.
    1660 PCADDLIBS=""
    1661 
    16621653
    16631654# As backup, we make sure we don't loose an FLIBS if it has been set
    16641655# by the user
    16651656save_FLIBS="$FLIBS"
    1666 
    1667 # Initialize the FADDLIBS variable (which is to be used with a fortran
    1668 # compiler and will not include FLIBS)
    1669 FADDLIBS="$LIBS"
    1670 
    16711657
    16721658# A useful makefile conditional that is always false
     
    31943180fi
    31953181
    3196 # Correct ADDLIBS initialization if we are using the MS compiler
     3182# Correct the LD variable if we are using the MS or Intel-windows compiler
    31973183case "$CC" in
    31983184  cl* | */cl* | CL* | */CL* | icl* | */icl* | ICL* | */ICL*)
    3199     ADDLIBS=
    32003185    case $build in
    32013186  *-mingw*)
     
    48314816*-*-irix6*)
    48324817  # Find out which ABI we are using.
    4833   echo '#line 4833 "configure"' > conftest.$ac_ext
     4818  echo '#line 4818 "configure"' > conftest.$ac_ext
    48344819  if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
    48354820  (eval $ac_compile) 2>&5
     
    64306415
    64316416# Provide some information about the compiler.
    6432 echo "$as_me:6432:" \
     6417echo "$as_me:6417:" \
    64336418     "checking for Fortran 77 compiler version" >&5
    64346419ac_compiler=`set X $ac_compile; echo $2`
     
    74977482   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    74987483   -e 's:$: $lt_compiler_flag:'`
    7499    (eval echo "\"\$as_me:7499: $lt_compile\"" >&5)
     7484   (eval echo "\"\$as_me:7484: $lt_compile\"" >&5)
    75007485   (eval "$lt_compile" 2>conftest.err)
    75017486   ac_status=$?
    75027487   cat conftest.err >&5
    7503    echo "$as_me:7503: \$? = $ac_status" >&5
     7488   echo "$as_me:7488: \$? = $ac_status" >&5
    75047489   if (exit $ac_status) && test -s "$ac_outfile"; then
    75057490     # The compiler can only warn and ignore the option if not recognized
     
    77657750   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    77667751   -e 's:$: $lt_compiler_flag:'`
    7767    (eval echo "\"\$as_me:7767: $lt_compile\"" >&5)
     7752   (eval echo "\"\$as_me:7752: $lt_compile\"" >&5)
    77687753   (eval "$lt_compile" 2>conftest.err)
    77697754   ac_status=$?
    77707755   cat conftest.err >&5
    7771    echo "$as_me:7771: \$? = $ac_status" >&5
     7756   echo "$as_me:7756: \$? = $ac_status" >&5
    77727757   if (exit $ac_status) && test -s "$ac_outfile"; then
    77737758     # The compiler can only warn and ignore the option if not recognized
     
    78697854   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    78707855   -e 's:$: $lt_compiler_flag:'`
    7871    (eval echo "\"\$as_me:7871: $lt_compile\"" >&5)
     7856   (eval echo "\"\$as_me:7856: $lt_compile\"" >&5)
    78727857   (eval "$lt_compile" 2>out/conftest.err)
    78737858   ac_status=$?
    78747859   cat out/conftest.err >&5
    7875    echo "$as_me:7875: \$? = $ac_status" >&5
     7860   echo "$as_me:7860: \$? = $ac_status" >&5
    78767861   if (exit $ac_status) && test -s out/conftest2.$ac_objext
    78777862   then
     
    1021410199  lt_status=$lt_dlunknown
    1021510200  cat > conftest.$ac_ext <<EOF
    10216 #line 10216 "configure"
     10201#line 10201 "configure"
    1021710202#include "confdefs.h"
    1021810203
     
    1031410299  lt_status=$lt_dlunknown
    1031510300  cat > conftest.$ac_ext <<EOF
    10316 #line 10316 "configure"
     10301#line 10301 "configure"
    1031710302#include "confdefs.h"
    1031810303
     
    1265812643   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1265912644   -e 's:$: $lt_compiler_flag:'`
    12660    (eval echo "\"\$as_me:12660: $lt_compile\"" >&5)
     12645   (eval echo "\"\$as_me:12645: $lt_compile\"" >&5)
    1266112646   (eval "$lt_compile" 2>conftest.err)
    1266212647   ac_status=$?
    1266312648   cat conftest.err >&5
    12664    echo "$as_me:12664: \$? = $ac_status" >&5
     12649   echo "$as_me:12649: \$? = $ac_status" >&5
    1266512650   if (exit $ac_status) && test -s "$ac_outfile"; then
    1266612651     # The compiler can only warn and ignore the option if not recognized
     
    1276212747   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1276312748   -e 's:$: $lt_compiler_flag:'`
    12764    (eval echo "\"\$as_me:12764: $lt_compile\"" >&5)
     12749   (eval echo "\"\$as_me:12749: $lt_compile\"" >&5)
    1276512750   (eval "$lt_compile" 2>out/conftest.err)
    1276612751   ac_status=$?
    1276712752   cat out/conftest.err >&5
    12768    echo "$as_me:12768: \$? = $ac_status" >&5
     12753   echo "$as_me:12753: \$? = $ac_status" >&5
    1276912754   if (exit $ac_status) && test -s out/conftest2.$ac_objext
    1277012755   then
     
    1433214317   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1433314318   -e 's:$: $lt_compiler_flag:'`
    14334    (eval echo "\"\$as_me:14334: $lt_compile\"" >&5)
     14319   (eval echo "\"\$as_me:14319: $lt_compile\"" >&5)
    1433514320   (eval "$lt_compile" 2>conftest.err)
    1433614321   ac_status=$?
    1433714322   cat conftest.err >&5
    14338    echo "$as_me:14338: \$? = $ac_status" >&5
     14323   echo "$as_me:14323: \$? = $ac_status" >&5
    1433914324   if (exit $ac_status) && test -s "$ac_outfile"; then
    1434014325     # The compiler can only warn and ignore the option if not recognized
     
    1443614421   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1443714422   -e 's:$: $lt_compiler_flag:'`
    14438    (eval echo "\"\$as_me:14438: $lt_compile\"" >&5)
     14423   (eval echo "\"\$as_me:14423: $lt_compile\"" >&5)
    1443914424   (eval "$lt_compile" 2>out/conftest.err)
    1444014425   ac_status=$?
    1444114426   cat out/conftest.err >&5
    14442    echo "$as_me:14442: \$? = $ac_status" >&5
     14427   echo "$as_me:14427: \$? = $ac_status" >&5
    1444314428   if (exit $ac_status) && test -s out/conftest2.$ac_objext
    1444414429   then
     
    1664316628   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1664416629   -e 's:$: $lt_compiler_flag:'`
    16645    (eval echo "\"\$as_me:16645: $lt_compile\"" >&5)
     16630   (eval echo "\"\$as_me:16630: $lt_compile\"" >&5)
    1664616631   (eval "$lt_compile" 2>conftest.err)
    1664716632   ac_status=$?
    1664816633   cat conftest.err >&5
    16649    echo "$as_me:16649: \$? = $ac_status" >&5
     16634   echo "$as_me:16634: \$? = $ac_status" >&5
    1665016635   if (exit $ac_status) && test -s "$ac_outfile"; then
    1665116636     # The compiler can only warn and ignore the option if not recognized
     
    1691116896   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1691216897   -e 's:$: $lt_compiler_flag:'`
    16913    (eval echo "\"\$as_me:16913: $lt_compile\"" >&5)
     16898   (eval echo "\"\$as_me:16898: $lt_compile\"" >&5)
    1691416899   (eval "$lt_compile" 2>conftest.err)
    1691516900   ac_status=$?
    1691616901   cat conftest.err >&5
    16917    echo "$as_me:16917: \$? = $ac_status" >&5
     16902   echo "$as_me:16902: \$? = $ac_status" >&5
    1691816903   if (exit $ac_status) && test -s "$ac_outfile"; then
    1691916904     # The compiler can only warn and ignore the option if not recognized
     
    1701517000   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1701617001   -e 's:$: $lt_compiler_flag:'`
    17017    (eval echo "\"\$as_me:17017: $lt_compile\"" >&5)
     17002   (eval echo "\"\$as_me:17002: $lt_compile\"" >&5)
    1701817003   (eval "$lt_compile" 2>out/conftest.err)
    1701917004   ac_status=$?
    1702017005   cat out/conftest.err >&5
    17021    echo "$as_me:17021: \$? = $ac_status" >&5
     17006   echo "$as_me:17006: \$? = $ac_status" >&5
    1702217007   if (exit $ac_status) && test -s out/conftest2.$ac_objext
    1702317008   then
     
    2009220077        COIN_PKG_CONFIG_PATH_UNINSTALLED="`cd ../$i; pwd`:${COIN_PKG_CONFIG_PATH_UNINSTALLED}"
    2009320078      fi
     20079      if test -d ../$i/pkgconfig ; then
     20080        COIN_PKG_CONFIG_PATH_UNINSTALLED="`cd ../$i/pkgconfig; pwd`:${COIN_PKG_CONFIG_PATH_UNINSTALLED}"
     20081      fi
    2009420082    done
    2009520083  fi
     
    2009920087      if test -d ../../$i ; then
    2010020088        COIN_PKG_CONFIG_PATH_UNINSTALLED="`cd ../../$i; pwd`:${COIN_PKG_CONFIG_PATH_UNINSTALLED}"
     20089      fi
     20090      if test -d ../../$i/pkgconfig ; then
     20091        COIN_PKG_CONFIG_PATH_UNINSTALLED="`cd ../../$i/pkgconfig; pwd`:${COIN_PKG_CONFIG_PATH_UNINSTALLED}"
    2010120092      fi
    2010220093    done
     
    2039620387if test x$coin_skip_ac_output != xyes; then
    2039720388
    20398   FADDLIBS="$ADDLIBS"
    20399   if test x"$coin_need_flibs" = xyes; then
    20400     ADDLIBS="$ADDLIBS $FLIBS"
    20401   fi
    20402   PCADDLIBS="$PCADDLIBS $ADDLIBS"
    20403 
    2040420389  # library extension
    2040520390
     
    2116121146s,@build_vendor@,$build_vendor,;t t
    2116221147s,@build_os@,$build_os,;t t
    21163 s,@ADDLIBS@,$ADDLIBS,;t t
    21164 s,@PCADDLIBS@,$PCADDLIBS,;t t
    21165 s,@FADDLIBS@,$FADDLIBS,;t t
    2116621148s,@ALWAYS_FALSE_TRUE@,$ALWAYS_FALSE_TRUE,;t t
    2116721149s,@ALWAYS_FALSE_FALSE@,$ALWAYS_FALSE_FALSE,;t t
Note: See TracChangeset for help on using the changeset viewer.