Changeset 1918 for ThirdParty/ASL


Ignore:
Timestamp:
Dec 19, 2010 11:19:25 AM (9 years ago)
Author:
stefan
Message:

sync with trunk rev.1902

Location:
ThirdParty/ASL/stable/1.1
Files:
7 edited

Legend:

Unmodified
Added
Removed
  • ThirdParty/ASL/stable/1.1

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

    r1740 r1918  
    101101distcleancheck_listfiles = find . -type f -print
    102102ABSBUILDDIR = @ABSBUILDDIR@
    103 ABSPATH_AMPLSOLVER_INSTALLED = @ABSPATH_AMPLSOLVER_INSTALLED@
    104 ABSPATH_AMPLSOLVER_UNINSTALLED = @ABSPATH_AMPLSOLVER_UNINSTALLED@
    105103ACLOCAL = @ACLOCAL@
    106104ADDLIBS = @ADDLIBS@
     
    126124CDEFS = @CDEFS@
    127125CFLAGS = @CFLAGS@
     126COIN_CC_IS_CL_FALSE = @COIN_CC_IS_CL_FALSE@
     127COIN_CC_IS_CL_TRUE = @COIN_CC_IS_CL_TRUE@
    128128COIN_HAS_PKGCONFIG_FALSE = @COIN_HAS_PKGCONFIG_FALSE@
    129129COIN_HAS_PKGCONFIG_TRUE = @COIN_HAS_PKGCONFIG_TRUE@
  • ThirdParty/ASL/stable/1.1/coinasl-uninstalled.pc.in

    r1678 r1918  
    55Description: AMPL Solver Library
    66Version: @PACKAGE_VERSION@
    7 Libs: @ABSPATH_AMPLSOLVER_UNINSTALLED@ @ASL_PCLIBS@
     7Libs: ${libdir}/@AMPLSOLVER_A@ @ASL_PCLIBS@
    88Cflags: -I@ABSBUILDDIR@ -I@abs_source_dir@/solvers
  • ThirdParty/ASL/stable/1.1/coinasl.pc.in

    r1678 r1918  
    77Description: AMPL Solver Library
    88Version: @PACKAGE_VERSION@
    9 Libs: @ABSPATH_AMPLSOLVER_INSTALLED@ @ASL_PCLIBS@
     9Libs: -L${libdir} -lamplsolver @ASL_PCLIBS@
    1010Cflags: -I${includedir}
  • ThirdParty/ASL/stable/1.1/compile_Unix_ASL.in

    r1269 r1918  
    9191# configure has already put the appropriate information into ASLMAKEFLAGS.
    9292
     93libampl=@AMPLSOLVER_A@
    9394make -f makefile.coin @ASLMAKEFLAGS@ CC="@CC@"
    9495mv amplsolver.a ../$libampl
  • ThirdParty/ASL/stable/1.1/configure

    r1849 r1918  
    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 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 ABSPATH_AMPLSOLVER_INSTALLED ABSPATH_AMPLSOLVER_UNINSTALLED 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 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'
    476476ac_subst_files=''
    477477
     
    19541954fi
    19551955
     1956# add automake conditional so we can recognize cl compiler in makefile
     1957coin_cc_is_cl=false
     1958if test x"$CXX" != x; then
     1959  case "$CXX" in
     1960    cl* | */cl* | CL* | */CL* | icl* | */icl* | ICL* | */ICL*)
     1961      coin_cc_is_cl=true
     1962      ;;
     1963  esac
     1964fi
     1965
     1966
     1967if test $coin_cc_is_cl = true; then
     1968  COIN_CC_IS_CL_TRUE=
     1969  COIN_CC_IS_CL_FALSE='#'
     1970else
     1971  COIN_CC_IS_CL_TRUE='#'
     1972  COIN_CC_IS_CL_FALSE=
     1973fi
     1974
     1975
    19561976
    19571977
     
    48104830*-*-irix6*)
    48114831  # Find out which ABI we are using.
    4812   echo '#line 4812 "configure"' > conftest.$ac_ext
     4832  echo '#line 4832 "configure"' > conftest.$ac_ext
    48134833  if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
    48144834  (eval $ac_compile) 2>&5
     
    64096429
    64106430# Provide some information about the compiler.
    6411 echo "$as_me:6411:" \
     6431echo "$as_me:6431:" \
    64126432     "checking for Fortran 77 compiler version" >&5
    64136433ac_compiler=`set X $ac_compile; echo $2`
     
    74767496   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    74777497   -e 's:$: $lt_compiler_flag:'`
    7478    (eval echo "\"\$as_me:7478: $lt_compile\"" >&5)
     7498   (eval echo "\"\$as_me:7498: $lt_compile\"" >&5)
    74797499   (eval "$lt_compile" 2>conftest.err)
    74807500   ac_status=$?
    74817501   cat conftest.err >&5
    7482    echo "$as_me:7482: \$? = $ac_status" >&5
     7502   echo "$as_me:7502: \$? = $ac_status" >&5
    74837503   if (exit $ac_status) && test -s "$ac_outfile"; then
    74847504     # The compiler can only warn and ignore the option if not recognized
     
    77447764   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    77457765   -e 's:$: $lt_compiler_flag:'`
    7746    (eval echo "\"\$as_me:7746: $lt_compile\"" >&5)
     7766   (eval echo "\"\$as_me:7766: $lt_compile\"" >&5)
    77477767   (eval "$lt_compile" 2>conftest.err)
    77487768   ac_status=$?
    77497769   cat conftest.err >&5
    7750    echo "$as_me:7750: \$? = $ac_status" >&5
     7770   echo "$as_me:7770: \$? = $ac_status" >&5
    77517771   if (exit $ac_status) && test -s "$ac_outfile"; then
    77527772     # The compiler can only warn and ignore the option if not recognized
     
    78487868   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    78497869   -e 's:$: $lt_compiler_flag:'`
    7850    (eval echo "\"\$as_me:7850: $lt_compile\"" >&5)
     7870   (eval echo "\"\$as_me:7870: $lt_compile\"" >&5)
    78517871   (eval "$lt_compile" 2>out/conftest.err)
    78527872   ac_status=$?
    78537873   cat out/conftest.err >&5
    7854    echo "$as_me:7854: \$? = $ac_status" >&5
     7874   echo "$as_me:7874: \$? = $ac_status" >&5
    78557875   if (exit $ac_status) && test -s out/conftest2.$ac_objext
    78567876   then
     
    1019310213  lt_status=$lt_dlunknown
    1019410214  cat > conftest.$ac_ext <<EOF
    10195 #line 10195 "configure"
     10215#line 10215 "configure"
    1019610216#include "confdefs.h"
    1019710217
     
    1029310313  lt_status=$lt_dlunknown
    1029410314  cat > conftest.$ac_ext <<EOF
    10295 #line 10295 "configure"
     10315#line 10315 "configure"
    1029610316#include "confdefs.h"
    1029710317
     
    1263712657   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1263812658   -e 's:$: $lt_compiler_flag:'`
    12639    (eval echo "\"\$as_me:12639: $lt_compile\"" >&5)
     12659   (eval echo "\"\$as_me:12659: $lt_compile\"" >&5)
    1264012660   (eval "$lt_compile" 2>conftest.err)
    1264112661   ac_status=$?
    1264212662   cat conftest.err >&5
    12643    echo "$as_me:12643: \$? = $ac_status" >&5
     12663   echo "$as_me:12663: \$? = $ac_status" >&5
    1264412664   if (exit $ac_status) && test -s "$ac_outfile"; then
    1264512665     # The compiler can only warn and ignore the option if not recognized
     
    1274112761   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1274212762   -e 's:$: $lt_compiler_flag:'`
    12743    (eval echo "\"\$as_me:12743: $lt_compile\"" >&5)
     12763   (eval echo "\"\$as_me:12763: $lt_compile\"" >&5)
    1274412764   (eval "$lt_compile" 2>out/conftest.err)
    1274512765   ac_status=$?
    1274612766   cat out/conftest.err >&5
    12747    echo "$as_me:12747: \$? = $ac_status" >&5
     12767   echo "$as_me:12767: \$? = $ac_status" >&5
    1274812768   if (exit $ac_status) && test -s out/conftest2.$ac_objext
    1274912769   then
     
    1431114331   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1431214332   -e 's:$: $lt_compiler_flag:'`
    14313    (eval echo "\"\$as_me:14313: $lt_compile\"" >&5)
     14333   (eval echo "\"\$as_me:14333: $lt_compile\"" >&5)
    1431414334   (eval "$lt_compile" 2>conftest.err)
    1431514335   ac_status=$?
    1431614336   cat conftest.err >&5
    14317    echo "$as_me:14317: \$? = $ac_status" >&5
     14337   echo "$as_me:14337: \$? = $ac_status" >&5
    1431814338   if (exit $ac_status) && test -s "$ac_outfile"; then
    1431914339     # The compiler can only warn and ignore the option if not recognized
     
    1441514435   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1441614436   -e 's:$: $lt_compiler_flag:'`
    14417    (eval echo "\"\$as_me:14417: $lt_compile\"" >&5)
     14437   (eval echo "\"\$as_me:14437: $lt_compile\"" >&5)
    1441814438   (eval "$lt_compile" 2>out/conftest.err)
    1441914439   ac_status=$?
    1442014440   cat out/conftest.err >&5
    14421    echo "$as_me:14421: \$? = $ac_status" >&5
     14441   echo "$as_me:14441: \$? = $ac_status" >&5
    1442214442   if (exit $ac_status) && test -s out/conftest2.$ac_objext
    1442314443   then
     
    1662216642   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1662316643   -e 's:$: $lt_compiler_flag:'`
    16624    (eval echo "\"\$as_me:16624: $lt_compile\"" >&5)
     16644   (eval echo "\"\$as_me:16644: $lt_compile\"" >&5)
    1662516645   (eval "$lt_compile" 2>conftest.err)
    1662616646   ac_status=$?
    1662716647   cat conftest.err >&5
    16628    echo "$as_me:16628: \$? = $ac_status" >&5
     16648   echo "$as_me:16648: \$? = $ac_status" >&5
    1662916649   if (exit $ac_status) && test -s "$ac_outfile"; then
    1663016650     # The compiler can only warn and ignore the option if not recognized
     
    1689016910   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1689116911   -e 's:$: $lt_compiler_flag:'`
    16892    (eval echo "\"\$as_me:16892: $lt_compile\"" >&5)
     16912   (eval echo "\"\$as_me:16912: $lt_compile\"" >&5)
    1689316913   (eval "$lt_compile" 2>conftest.err)
    1689416914   ac_status=$?
    1689516915   cat conftest.err >&5
    16896    echo "$as_me:16896: \$? = $ac_status" >&5
     16916   echo "$as_me:16916: \$? = $ac_status" >&5
    1689716917   if (exit $ac_status) && test -s "$ac_outfile"; then
    1689816918     # The compiler can only warn and ignore the option if not recognized
     
    1699417014   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1699517015   -e 's:$: $lt_compiler_flag:'`
    16996    (eval echo "\"\$as_me:16996: $lt_compile\"" >&5)
     17016   (eval echo "\"\$as_me:17016: $lt_compile\"" >&5)
    1699717017   (eval "$lt_compile" 2>out/conftest.err)
    1699817018   ac_status=$?
    1699917019   cat out/conftest.err >&5
    17000    echo "$as_me:17000: \$? = $ac_status" >&5
     17020   echo "$as_me:17020: \$? = $ac_status" >&5
    1700117021   if (exit $ac_status) && test -s out/conftest2.$ac_objext
    1700217022   then
     
    2009720117case "$CC" in
    2009820118  cl* | */cl* | CL* | */CL* | icl* | */icl* | ICL* | */ICL*)
    20099     AMPLSOLVER_A=amplsolv.lib
     20119    AMPLSOLVER_A=libamplsolver.lib
    2010020120    msvc_compile=yes
    2010120121    ;;
    2010220122  *)
    20103     AMPLSOLVER_A=amplsolver.a
     20123    AMPLSOLVER_A=libamplsolver.a
    2010420124    msvc_compile=no
    2010520125    ;;
     
    2010720127{ echo "$as_me:$LINENO: Configuring ASL to build $AMPLSOLVER_A." >&5
    2010820128echo "$as_me: Configuring ASL to build $AMPLSOLVER_A." >&6;}
    20109 
    20110 # Set substitutable variables with the absolute path to the library name
    20111 # translate to windows style if necessary, but use slashes instead of backslashes
    20112 ABSPATH_AMPLSOLVER_INSTALLED=`${CYGPATH_W} ${prefix}/lib/coin/ThirdParty/${AMPLSOLVER_A} | sed -e 's/\\\\/\\//g'`
    20113 curdir=`pwd`
    20114 ABSPATH_AMPLSOLVER_UNINSTALLED=`${CYGPATH_W} ${curdir}/${AMPLSOLVER_A} | sed -e 's/\\\\/\\//g'`
    20115 
    20116 
    2011720129
    2011820130# Determine flags to be passed on the command line to (n)make. The main
     
    2035420366      ASL_LIBS="-lm $ASL_LIBS"
    2035520367      ASL_PCLIBS="-lm $ASL_PCLIBS"
     20368      ASL_LIBS_INSTALLED="-lm $ASL_LIBS_INSTALLED"
    2035620369
    2035720370  ;;
     
    2055520568Usually this means the macro was only invoked conditionally." >&5
    2055620569echo "$as_me: error: conditional \"ALWAYS_FALSE\" was never defined.
     20570Usually this means the macro was only invoked conditionally." >&2;}
     20571   { (exit 1); exit 1; }; }
     20572fi
     20573if test -z "${COIN_CC_IS_CL_TRUE}" && test -z "${COIN_CC_IS_CL_FALSE}"; then
     20574  { { echo "$as_me:$LINENO: error: conditional \"COIN_CC_IS_CL\" was never defined.
     20575Usually this means the macro was only invoked conditionally." >&5
     20576echo "$as_me: error: conditional \"COIN_CC_IS_CL\" was never defined.
    2055720577Usually this means the macro was only invoked conditionally." >&2;}
    2055820578   { (exit 1); exit 1; }; }
     
    2114921169s,@EGREP@,$EGREP,;t t
    2115021170s,@LN_S@,$LN_S,;t t
     21171s,@COIN_CC_IS_CL_TRUE@,$COIN_CC_IS_CL_TRUE,;t t
     21172s,@COIN_CC_IS_CL_FALSE@,$COIN_CC_IS_CL_FALSE,;t t
    2115121173s,@CDEFS@,$CDEFS,;t t
    2115221174s,@ADD_CFLAGS@,$ADD_CFLAGS,;t t
     
    2124021262s,@COIN_PKG_CONFIG_PATH_UNINSTALLED@,$COIN_PKG_CONFIG_PATH_UNINSTALLED,;t t
    2124121263s,@AMPLSOLVER_A@,$AMPLSOLVER_A,;t t
    21242 s,@ABSPATH_AMPLSOLVER_INSTALLED@,$ABSPATH_AMPLSOLVER_INSTALLED,;t t
    21243 s,@ABSPATH_AMPLSOLVER_UNINSTALLED@,$ABSPATH_AMPLSOLVER_UNINSTALLED,;t t
    2124421264s,@ASLMAKEFLAGS@,$ASLMAKEFLAGS,;t t
    2124521265s,@MSVC_COMPILE_TRUE@,$MSVC_COMPILE_TRUE,;t t
  • ThirdParty/ASL/stable/1.1/configure.ac

    r1849 r1918  
    7272case "$CC" in
    7373  cl* | */cl* | CL* | */CL* | icl* | */icl* | ICL* | */ICL*)
    74     AMPLSOLVER_A=amplsolv.lib
     74    AMPLSOLVER_A=libamplsolver.lib
    7575    msvc_compile=yes
    7676    ;;
    7777  *)
    78     AMPLSOLVER_A=amplsolver.a
     78    AMPLSOLVER_A=libamplsolver.a
    7979    msvc_compile=no
    8080    ;;
    8181esac
    8282AC_MSG_NOTICE([Configuring ASL to build $AMPLSOLVER_A.])
    83 
    84 # Set substitutable variables with the absolute path to the library name
    85 # translate to windows style if necessary, but use slashes instead of backslashes
    86 ABSPATH_AMPLSOLVER_INSTALLED=`${CYGPATH_W} ${prefix}/lib/coin/ThirdParty/${AMPLSOLVER_A} | sed -e 's/\\\\/\\//g'`
    87 curdir=`pwd`
    88 ABSPATH_AMPLSOLVER_UNINSTALLED=`${CYGPATH_W} ${curdir}/${AMPLSOLVER_A} | sed -e 's/\\\\/\\//g'`
    89 AC_SUBST(ABSPATH_AMPLSOLVER_INSTALLED)
    90 AC_SUBST(ABSPATH_AMPLSOLVER_UNINSTALLED)
    9183
    9284# Determine flags to be passed on the command line to (n)make. The main
Note: See TracChangeset for help on using the changeset viewer.