Changeset 1683


Ignore:
Timestamp:
Sep 13, 2010 3:38:08 AM (10 years ago)
Author:
stefan
Message:

change from COIN_HAS_MODULE to COIN_HAS_PACKAGE

Location:
ThirdParty/HSL/trunk
Files:
5 edited

Legend:

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

    r1661 r1683  
    207207HAVE_EXTERNALS_TRUE = @HAVE_EXTERNALS_TRUE@
    208208HAVE_MXXX_CFLAGS = @HAVE_MXXX_CFLAGS@
     209HSL_PCLIBS = @HSL_PCLIBS@
    209210HSL_SHARED_LIB = @HSL_SHARED_LIB@
    210211HSL_SVN_REV = @HSL_SVN_REV@
  • ThirdParty/HSL/trunk/coinhsl-uninstalled.pc.in

    r1619 r1683  
    55Description: Harwell Subroutines Library
    66Version: @PACKAGE_VERSION@
    7 Libs: -L${libdir} -lcoinhsl @PCADDLIBS@
     7Libs: -L${libdir} -lcoinhsl @HSL_PCLIBS@
    88Cflags: @HAVE_MXXX_CFLAGS@
  • ThirdParty/HSL/trunk/coinhsl.pc.in

    r1619 r1683  
    66Description: Harwell Subroutines Library
    77Version: @PACKAGE_VERSION@
    8 Libs: -L${libdir} -lcoinhsl @PCADDLIBS@
     8Libs: -L${libdir} -lcoinhsl @HSL_PCLIBS@
    99Cflags: @HAVE_MXXX_CFLAGS@
  • ThirdParty/HSL/trunk/configure

    r1671 r1683  
    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 PCADDLIBS FADDLIBS ALWAYS_FALSE_TRUE ALWAYS_FALSE_FALSE have_svnversion HSL_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 PKG_CONFIG ac_pt_PKG_CONFIG COIN_HAS_PKGCONFIG_TRUE COIN_HAS_PKGCONFIG_FALSE COIN_PKG_CONFIG_PATH COIN_PKG_CONFIG_PATH_UNINSTALLED FLIBS EGREP FC FCFLAGS ac_ct_FC 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 COIN_HAS_MA27_TRUE COIN_HAS_MA27_FALSE COIN_HAS_MC19_TRUE COIN_HAS_MC19_FALSE COIN_HAS_MA57_TRUE COIN_HAS_MA57_FALSE COIN_HAS_MA28_TRUE COIN_HAS_MA28_FALSE COIN_HAS_MA77_TRUE COIN_HAS_MA77_FALSE HAVE_MXXX_CFLAGS F77_SHARED_CMD F77_DLL_LINKFLAGS HSL_SHARED_LIB EXPORT_SYMBOLS DEFFILE INSTALL_LOADABLE_LIBRARY_TRUE INSTALL_LOADABLE_LIBRARY_FALSE NEED_DEFFILE_TRUE NEED_DEFFILE_FALSE EXTRA_SHARED_COMMAND_TRUE EXTRA_SHARED_COMMAND_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 ADDLIBS PCADDLIBS FADDLIBS ALWAYS_FALSE_TRUE ALWAYS_FALSE_FALSE have_svnversion HSL_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 PKG_CONFIG ac_pt_PKG_CONFIG COIN_HAS_PKGCONFIG_TRUE COIN_HAS_PKGCONFIG_FALSE COIN_PKG_CONFIG_PATH COIN_PKG_CONFIG_PATH_UNINSTALLED FLIBS HSL_PCLIBS EGREP FC FCFLAGS ac_ct_FC 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 COIN_HAS_MA27_TRUE COIN_HAS_MA27_FALSE COIN_HAS_MC19_TRUE COIN_HAS_MC19_FALSE COIN_HAS_MA57_TRUE COIN_HAS_MA57_FALSE COIN_HAS_MA28_TRUE COIN_HAS_MA28_FALSE COIN_HAS_MA77_TRUE COIN_HAS_MA77_FALSE HAVE_MXXX_CFLAGS F77_SHARED_CMD F77_DLL_LINKFLAGS HSL_SHARED_LIB EXPORT_SYMBOLS DEFFILE INSTALL_LOADABLE_LIBRARY_TRUE INSTALL_LOADABLE_LIBRARY_FALSE NEED_DEFFILE_TRUE NEED_DEFFILE_FALSE EXTRA_SHARED_COMMAND_TRUE EXTRA_SHARED_COMMAND_FALSE LIBEXT VPATH_DISTCLEANFILES ABSBUILDDIR LIBOBJS LTLIBOBJS'
    476476ac_subst_files=''
    477477
     
    16581658fi
    16591659
    1660 # Set the project's SVN revision number
     1660# Set the project's SVN revision number. The complicated sed expression
     1661# (made worse by quadrigraphs) ensures that things like 4123:4168MS end up
     1662# as a single number.
    16611663# Extract the first word of "svnversion", so it can be a program name with args.
    16621664set dummy svnversion; ac_word=$2
     
    16971699if test "x$have_svnversion" = xyes && test "xHSL" != x; then
    16981700
    1699   HSL_SVN_REV=`cd $srcdir/$coin_has_hsl ; svnversion`
     1701  svn_rev_tmp=`cd $srcdir/$coin_has_hsl ; svnversion`
     1702  HSL_SVN_REV=`echo $svn_rev_tmp | sed -n -e 's/^[0-9]*://' -e 's/\([0-9]\)[^0-9]*$/\1/p'`
    17001703  if test $HSL_SVN_REV != exported; then
    17011704
    17021705cat >>confdefs.h <<_ACEOF
    1703 #define HSL_SVN_REV "$HSL_SVN_REV"
     1706#define HSL_SVN_REV $HSL_SVN_REV
    17041707_ACEOF
    17051708
     
    33863389
    33873390# Provide some information about the compiler.
    3388 echo "$as_me:3388:" \
     3391echo "$as_me:3391:" \
    33893392     "checking for Fortran 77 compiler version" >&5
    33903393ac_compiler=`set X $ac_compile; echo $2`
     
    41414144ac_save_FFLAGS=$FFLAGS
    41424145FFLAGS="$FFLAGS $ac_verb"
    4143 (eval echo $as_me:4143: \"$ac_link\") >&5
     4146(eval echo $as_me:4146: \"$ac_link\") >&5
    41444147ac_f77_v_output=`eval $ac_link 5>&1 2>&1 | grep -v 'Driving:'`
    41454148echo "$ac_f77_v_output" >&5
     
    42194222ac_save_FFLAGS=$FFLAGS
    42204223FFLAGS="$FFLAGS $ac_cv_prog_f77_v"
    4221 (eval echo $as_me:4221: \"$ac_link\") >&5
     4224(eval echo $as_me:4224: \"$ac_link\") >&5
    42224225ac_f77_v_output=`eval $ac_link 5>&1 2>&1 | grep -v 'Driving:'`
    42234226echo "$ac_f77_v_output" >&5
     
    49704973
    49714974
    4972 # Tell FINALIZE to add FLIBS to ADDLIBS, so that they get into the .pc files
    4973 coin_need_flibs=yes
     4975# Add FLIBS to HSL_PCLIBS, so that they get into the .pc files
     4976HSL_PCLIBS="$FLIBS"
     4977
    49744978
    49754979# Need egrep later on
     
    50915095
    50925096# Provide some information about the compiler.
    5093 echo "$as_me:5093:" \
     5097echo "$as_me:5097:" \
    50945098     "checking for Fortran compiler version" >&5
    50955099ac_compiler=`set X $ac_compile; echo $2`
     
    68576861*-*-irix6*)
    68586862  # Find out which ABI we are using.
    6859   echo '#line 6859 "configure"' > conftest.$ac_ext
     6863  echo '#line 6863 "configure"' > conftest.$ac_ext
    68606864  if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
    68616865  (eval $ac_compile) 2>&5
     
    93349338   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    93359339   -e 's:$: $lt_compiler_flag:'`
    9336    (eval echo "\"\$as_me:9336: $lt_compile\"" >&5)
     9340   (eval echo "\"\$as_me:9340: $lt_compile\"" >&5)
    93379341   (eval "$lt_compile" 2>conftest.err)
    93389342   ac_status=$?
    93399343   cat conftest.err >&5
    9340    echo "$as_me:9340: \$? = $ac_status" >&5
     9344   echo "$as_me:9344: \$? = $ac_status" >&5
    93419345   if (exit $ac_status) && test -s "$ac_outfile"; then
    93429346     # The compiler can only warn and ignore the option if not recognized
     
    96029606   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    96039607   -e 's:$: $lt_compiler_flag:'`
    9604    (eval echo "\"\$as_me:9604: $lt_compile\"" >&5)
     9608   (eval echo "\"\$as_me:9608: $lt_compile\"" >&5)
    96059609   (eval "$lt_compile" 2>conftest.err)
    96069610   ac_status=$?
    96079611   cat conftest.err >&5
    9608    echo "$as_me:9608: \$? = $ac_status" >&5
     9612   echo "$as_me:9612: \$? = $ac_status" >&5
    96099613   if (exit $ac_status) && test -s "$ac_outfile"; then
    96109614     # The compiler can only warn and ignore the option if not recognized
     
    97069710   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    97079711   -e 's:$: $lt_compiler_flag:'`
    9708    (eval echo "\"\$as_me:9708: $lt_compile\"" >&5)
     9712   (eval echo "\"\$as_me:9712: $lt_compile\"" >&5)
    97099713   (eval "$lt_compile" 2>out/conftest.err)
    97109714   ac_status=$?
    97119715   cat out/conftest.err >&5
    9712    echo "$as_me:9712: \$? = $ac_status" >&5
     9716   echo "$as_me:9716: \$? = $ac_status" >&5
    97139717   if (exit $ac_status) && test -s out/conftest2.$ac_objext
    97149718   then
     
    1212312127  lt_status=$lt_dlunknown
    1212412128  cat > conftest.$ac_ext <<EOF
    12125 #line 12125 "configure"
     12129#line 12129 "configure"
    1212612130#include "confdefs.h"
    1212712131
     
    1222312227  lt_status=$lt_dlunknown
    1222412228  cat > conftest.$ac_ext <<EOF
    12225 #line 12225 "configure"
     12229#line 12229 "configure"
    1222612230#include "confdefs.h"
    1222712231
     
    1458314587   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1458414588   -e 's:$: $lt_compiler_flag:'`
    14585    (eval echo "\"\$as_me:14585: $lt_compile\"" >&5)
     14589   (eval echo "\"\$as_me:14589: $lt_compile\"" >&5)
    1458614590   (eval "$lt_compile" 2>conftest.err)
    1458714591   ac_status=$?
    1458814592   cat conftest.err >&5
    14589    echo "$as_me:14589: \$? = $ac_status" >&5
     14593   echo "$as_me:14593: \$? = $ac_status" >&5
    1459014594   if (exit $ac_status) && test -s "$ac_outfile"; then
    1459114595     # The compiler can only warn and ignore the option if not recognized
     
    1468714691   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1468814692   -e 's:$: $lt_compiler_flag:'`
    14689    (eval echo "\"\$as_me:14689: $lt_compile\"" >&5)
     14693   (eval echo "\"\$as_me:14693: $lt_compile\"" >&5)
    1469014694   (eval "$lt_compile" 2>out/conftest.err)
    1469114695   ac_status=$?
    1469214696   cat out/conftest.err >&5
    14693    echo "$as_me:14693: \$? = $ac_status" >&5
     14697   echo "$as_me:14697: \$? = $ac_status" >&5
    1469414698   if (exit $ac_status) && test -s out/conftest2.$ac_objext
    1469514699   then
     
    1625716261   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1625816262   -e 's:$: $lt_compiler_flag:'`
    16259    (eval echo "\"\$as_me:16259: $lt_compile\"" >&5)
     16263   (eval echo "\"\$as_me:16263: $lt_compile\"" >&5)
    1626016264   (eval "$lt_compile" 2>conftest.err)
    1626116265   ac_status=$?
    1626216266   cat conftest.err >&5
    16263    echo "$as_me:16263: \$? = $ac_status" >&5
     16267   echo "$as_me:16267: \$? = $ac_status" >&5
    1626416268   if (exit $ac_status) && test -s "$ac_outfile"; then
    1626516269     # The compiler can only warn and ignore the option if not recognized
     
    1636116365   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1636216366   -e 's:$: $lt_compiler_flag:'`
    16363    (eval echo "\"\$as_me:16363: $lt_compile\"" >&5)
     16367   (eval echo "\"\$as_me:16367: $lt_compile\"" >&5)
    1636416368   (eval "$lt_compile" 2>out/conftest.err)
    1636516369   ac_status=$?
    1636616370   cat out/conftest.err >&5
    16367    echo "$as_me:16367: \$? = $ac_status" >&5
     16371   echo "$as_me:16371: \$? = $ac_status" >&5
    1636816372   if (exit $ac_status) && test -s out/conftest2.$ac_objext
    1636916373   then
     
    1856818572   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1856918573   -e 's:$: $lt_compiler_flag:'`
    18570    (eval echo "\"\$as_me:18570: $lt_compile\"" >&5)
     18574   (eval echo "\"\$as_me:18574: $lt_compile\"" >&5)
    1857118575   (eval "$lt_compile" 2>conftest.err)
    1857218576   ac_status=$?
    1857318577   cat conftest.err >&5
    18574    echo "$as_me:18574: \$? = $ac_status" >&5
     18578   echo "$as_me:18578: \$? = $ac_status" >&5
    1857518579   if (exit $ac_status) && test -s "$ac_outfile"; then
    1857618580     # The compiler can only warn and ignore the option if not recognized
     
    1883618840   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1883718841   -e 's:$: $lt_compiler_flag:'`
    18838    (eval echo "\"\$as_me:18838: $lt_compile\"" >&5)
     18842   (eval echo "\"\$as_me:18842: $lt_compile\"" >&5)
    1883918843   (eval "$lt_compile" 2>conftest.err)
    1884018844   ac_status=$?
    1884118845   cat conftest.err >&5
    18842    echo "$as_me:18842: \$? = $ac_status" >&5
     18846   echo "$as_me:18846: \$? = $ac_status" >&5
    1884318847   if (exit $ac_status) && test -s "$ac_outfile"; then
    1884418848     # The compiler can only warn and ignore the option if not recognized
     
    1894018944   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1894118945   -e 's:$: $lt_compiler_flag:'`
    18942    (eval echo "\"\$as_me:18942: $lt_compile\"" >&5)
     18946   (eval echo "\"\$as_me:18946: $lt_compile\"" >&5)
    1894318947   (eval "$lt_compile" 2>out/conftest.err)
    1894418948   ac_status=$?
    1894518949   cat out/conftest.err >&5
    18946    echo "$as_me:18946: \$? = $ac_status" >&5
     18950   echo "$as_me:18950: \$? = $ac_status" >&5
    1894718951   if (exit $ac_status) && test -s out/conftest2.$ac_objext
    1894818952   then
     
    2298122985s,@COIN_PKG_CONFIG_PATH_UNINSTALLED@,$COIN_PKG_CONFIG_PATH_UNINSTALLED,;t t
    2298222986s,@FLIBS@,$FLIBS,;t t
     22987s,@HSL_PCLIBS@,$HSL_PCLIBS,;t t
    2298322988s,@EGREP@,$EGREP,;t t
    2298422989s,@FC@,$FC,;t t
  • ThirdParty/HSL/trunk/configure.ac

    r1661 r1683  
    6666AC_COIN_F77_WRAPPERS
    6767
    68 # Tell FINALIZE to add FLIBS to ADDLIBS, so that they get into the .pc files
    69 coin_need_flibs=yes
     68# Add FLIBS to HSL_PCLIBS, so that they get into the .pc files
     69HSL_PCLIBS="$FLIBS"
     70AC_SUBST(HSL_PCLIBS)
    7071
    7172# Need egrep later on
Note: See TracChangeset for help on using the changeset viewer.