Changeset 1678 for ThirdParty/ASL


Ignore:
Timestamp:
Sep 13, 2010 3:37:15 AM (9 years ago)
Author:
stefan
Message:

change from COIN_HAS_MODULE to COIN_HAS_PACKAGE

Location:
ThirdParty/ASL/trunk
Files:
5 edited

Legend:

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

    r1646 r1678  
    114114AR = @AR@
    115115ASLMAKEFLAGS = @ASLMAKEFLAGS@
     116ASL_PCLIBS = @ASL_PCLIBS@
    116117ASL_SVN_REV = @ASL_SVN_REV@
    117118AUTOCONF = @AUTOCONF@
  • ThirdParty/ASL/trunk/coinasl-uninstalled.pc.in

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

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

    r1664 r1678  
    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 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 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'
    476476ac_subst_files=''
    477477
     
    16951695fi
    16961696
    1697 # Set the project's SVN revision number
     1697# Set the project's SVN revision number. The complicated sed expression
     1698# (made worse by quadrigraphs) ensures that things like 4123:4168MS end up
     1699# as a single number.
    16981700# Extract the first word of "svnversion", so it can be a program name with args.
    16991701set dummy svnversion; ac_word=$2
     
    17341736if test "x$have_svnversion" = xyes && test "xASL" != x; then
    17351737
    1736   ASL_SVN_REV=`cd $srcdir/$coin_has_asl ; svnversion`
     1738  svn_rev_tmp=`cd $srcdir/$coin_has_asl ; svnversion`
     1739  ASL_SVN_REV=`echo $svn_rev_tmp | sed -n -e 's/^[0-9]*://' -e 's/\([0-9]\)[^0-9]*$/\1/p'`
    17371740  if test $ASL_SVN_REV != exported; then
    17381741
    17391742cat >>confdefs.h <<_ACEOF
    1740 #define ASL_SVN_REV "$ASL_SVN_REV"
     1743#define ASL_SVN_REV $ASL_SVN_REV
    17411744_ACEOF
    17421745
     
    48074810*-*-irix6*)
    48084811  # Find out which ABI we are using.
    4809   echo '#line 4809 "configure"' > conftest.$ac_ext
     4812  echo '#line 4812 "configure"' > conftest.$ac_ext
    48104813  if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
    48114814  (eval $ac_compile) 2>&5
     
    64066409
    64076410# Provide some information about the compiler.
    6408 echo "$as_me:6408:" \
     6411echo "$as_me:6411:" \
    64096412     "checking for Fortran 77 compiler version" >&5
    64106413ac_compiler=`set X $ac_compile; echo $2`
     
    74737476   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    74747477   -e 's:$: $lt_compiler_flag:'`
    7475    (eval echo "\"\$as_me:7475: $lt_compile\"" >&5)
     7478   (eval echo "\"\$as_me:7478: $lt_compile\"" >&5)
    74767479   (eval "$lt_compile" 2>conftest.err)
    74777480   ac_status=$?
    74787481   cat conftest.err >&5
    7479    echo "$as_me:7479: \$? = $ac_status" >&5
     7482   echo "$as_me:7482: \$? = $ac_status" >&5
    74807483   if (exit $ac_status) && test -s "$ac_outfile"; then
    74817484     # The compiler can only warn and ignore the option if not recognized
     
    77417744   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    77427745   -e 's:$: $lt_compiler_flag:'`
    7743    (eval echo "\"\$as_me:7743: $lt_compile\"" >&5)
     7746   (eval echo "\"\$as_me:7746: $lt_compile\"" >&5)
    77447747   (eval "$lt_compile" 2>conftest.err)
    77457748   ac_status=$?
    77467749   cat conftest.err >&5
    7747    echo "$as_me:7747: \$? = $ac_status" >&5
     7750   echo "$as_me:7750: \$? = $ac_status" >&5
    77487751   if (exit $ac_status) && test -s "$ac_outfile"; then
    77497752     # The compiler can only warn and ignore the option if not recognized
     
    78457848   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    78467849   -e 's:$: $lt_compiler_flag:'`
    7847    (eval echo "\"\$as_me:7847: $lt_compile\"" >&5)
     7850   (eval echo "\"\$as_me:7850: $lt_compile\"" >&5)
    78487851   (eval "$lt_compile" 2>out/conftest.err)
    78497852   ac_status=$?
    78507853   cat out/conftest.err >&5
    7851    echo "$as_me:7851: \$? = $ac_status" >&5
     7854   echo "$as_me:7854: \$? = $ac_status" >&5
    78527855   if (exit $ac_status) && test -s out/conftest2.$ac_objext
    78537856   then
     
    1019010193  lt_status=$lt_dlunknown
    1019110194  cat > conftest.$ac_ext <<EOF
    10192 #line 10192 "configure"
     10195#line 10195 "configure"
    1019310196#include "confdefs.h"
    1019410197
     
    1029010293  lt_status=$lt_dlunknown
    1029110294  cat > conftest.$ac_ext <<EOF
    10292 #line 10292 "configure"
     10295#line 10295 "configure"
    1029310296#include "confdefs.h"
    1029410297
     
    1263412637   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1263512638   -e 's:$: $lt_compiler_flag:'`
    12636    (eval echo "\"\$as_me:12636: $lt_compile\"" >&5)
     12639   (eval echo "\"\$as_me:12639: $lt_compile\"" >&5)
    1263712640   (eval "$lt_compile" 2>conftest.err)
    1263812641   ac_status=$?
    1263912642   cat conftest.err >&5
    12640    echo "$as_me:12640: \$? = $ac_status" >&5
     12643   echo "$as_me:12643: \$? = $ac_status" >&5
    1264112644   if (exit $ac_status) && test -s "$ac_outfile"; then
    1264212645     # The compiler can only warn and ignore the option if not recognized
     
    1273812741   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1273912742   -e 's:$: $lt_compiler_flag:'`
    12740    (eval echo "\"\$as_me:12740: $lt_compile\"" >&5)
     12743   (eval echo "\"\$as_me:12743: $lt_compile\"" >&5)
    1274112744   (eval "$lt_compile" 2>out/conftest.err)
    1274212745   ac_status=$?
    1274312746   cat out/conftest.err >&5
    12744    echo "$as_me:12744: \$? = $ac_status" >&5
     12747   echo "$as_me:12747: \$? = $ac_status" >&5
    1274512748   if (exit $ac_status) && test -s out/conftest2.$ac_objext
    1274612749   then
     
    1430814311   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1430914312   -e 's:$: $lt_compiler_flag:'`
    14310    (eval echo "\"\$as_me:14310: $lt_compile\"" >&5)
     14313   (eval echo "\"\$as_me:14313: $lt_compile\"" >&5)
    1431114314   (eval "$lt_compile" 2>conftest.err)
    1431214315   ac_status=$?
    1431314316   cat conftest.err >&5
    14314    echo "$as_me:14314: \$? = $ac_status" >&5
     14317   echo "$as_me:14317: \$? = $ac_status" >&5
    1431514318   if (exit $ac_status) && test -s "$ac_outfile"; then
    1431614319     # The compiler can only warn and ignore the option if not recognized
     
    1441214415   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1441314416   -e 's:$: $lt_compiler_flag:'`
    14414    (eval echo "\"\$as_me:14414: $lt_compile\"" >&5)
     14417   (eval echo "\"\$as_me:14417: $lt_compile\"" >&5)
    1441514418   (eval "$lt_compile" 2>out/conftest.err)
    1441614419   ac_status=$?
    1441714420   cat out/conftest.err >&5
    14418    echo "$as_me:14418: \$? = $ac_status" >&5
     14421   echo "$as_me:14421: \$? = $ac_status" >&5
    1441914422   if (exit $ac_status) && test -s out/conftest2.$ac_objext
    1442014423   then
     
    1661916622   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1662016623   -e 's:$: $lt_compiler_flag:'`
    16621    (eval echo "\"\$as_me:16621: $lt_compile\"" >&5)
     16624   (eval echo "\"\$as_me:16624: $lt_compile\"" >&5)
    1662216625   (eval "$lt_compile" 2>conftest.err)
    1662316626   ac_status=$?
    1662416627   cat conftest.err >&5
    16625    echo "$as_me:16625: \$? = $ac_status" >&5
     16628   echo "$as_me:16628: \$? = $ac_status" >&5
    1662616629   if (exit $ac_status) && test -s "$ac_outfile"; then
    1662716630     # The compiler can only warn and ignore the option if not recognized
     
    1688716890   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1688816891   -e 's:$: $lt_compiler_flag:'`
    16889    (eval echo "\"\$as_me:16889: $lt_compile\"" >&5)
     16892   (eval echo "\"\$as_me:16892: $lt_compile\"" >&5)
    1689016893   (eval "$lt_compile" 2>conftest.err)
    1689116894   ac_status=$?
    1689216895   cat conftest.err >&5
    16893    echo "$as_me:16893: \$? = $ac_status" >&5
     16896   echo "$as_me:16896: \$? = $ac_status" >&5
    1689416897   if (exit $ac_status) && test -s "$ac_outfile"; then
    1689516898     # The compiler can only warn and ignore the option if not recognized
     
    1699116994   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1699216995   -e 's:$: $lt_compiler_flag:'`
    16993    (eval echo "\"\$as_me:16993: $lt_compile\"" >&5)
     16996   (eval echo "\"\$as_me:16996: $lt_compile\"" >&5)
    1699416997   (eval "$lt_compile" 2>out/conftest.err)
    1699516998   ac_status=$?
    1699616999   cat out/conftest.err >&5
    16997    echo "$as_me:16997: \$? = $ac_status" >&5
     17000   echo "$as_me:17000: \$? = $ac_status" >&5
    1699817001   if (exit $ac_status) && test -s out/conftest2.$ac_objext
    1699917002   then
     
    2033620339
    2033720340                    ac_config_files="$ac_config_files coinasl.pc coinasl-uninstalled.pc"
     20341
     20342
     20343
     20344
     20345case "$CC" in
     20346  cl* | */cl* | CL* | */CL* | icl* | */icl* | ICL* | */ICL*)
     20347    ;;
     20348  *)
     20349
     20350      ASL_LIBS="-lm $ASL_LIBS"
     20351      ASL_PCLIBS="-lm $ASL_PCLIBS"
     20352
     20353  ;;
     20354esac
     20355
     20356
    2033820357
    2033920358
     
    2122221241s,@MSVC_COMPILE_TRUE@,$MSVC_COMPILE_TRUE,;t t
    2122321242s,@MSVC_COMPILE_FALSE@,$MSVC_COMPILE_FALSE,;t t
     21243s,@ASL_PCLIBS@,$ASL_PCLIBS,;t t
    2122421244s,@LIBEXT@,$LIBEXT,;t t
    2122521245s,@VPATH_DISTCLEANFILES@,$VPATH_DISTCLEANFILES,;t t
  • ThirdParty/ASL/trunk/configure.ac

    r1582 r1678  
    190190AC_CONFIG_FILES([coinasl.pc coinasl-uninstalled.pc])
    191191
     192AC_COIN_CHECK_LIBM(ASL)
     193AC_SUBST(ASL_PCLIBS)
     194
    192195AC_COIN_FINALIZE
Note: See TracChangeset for help on using the changeset viewer.