Changeset 1586


Ignore:
Timestamp:
Jun 19, 2010 2:01:30 PM (9 years ago)
Author:
stefan
Message:

give project name to COIN_PROJECTDIR_INIT; rerun autotools

Location:
ThirdParty/HSL/trunk
Files:
3 edited

Legend:

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

    r1569 r1586  
    207207HAVE_MXXX_CFLAGS = @HAVE_MXXX_CFLAGS@
    208208HSL_SHARED_LIB = @HSL_SHARED_LIB@
     209HSL_SVN_REV = @HSL_SVN_REV@
    209210INSTALL_DATA = @INSTALL_DATA@
    210211INSTALL_LOADABLE_LIBRARY_FALSE = @INSTALL_LOADABLE_LIBRARY_FALSE@
     
    248249VERSION = @VERSION@
    249250VPATH_DISTCLEANFILES = @VPATH_DISTCLEANFILES@
    250 _SVN_REV = @_SVN_REV@
    251251abs_bin_dir = @abs_bin_dir@
    252252abs_include_dir = @abs_include_dir@
  • ThirdParty/HSL/trunk/configure

    r1552 r1586  
    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 FADDLIBS ALWAYS_FALSE_TRUE ALWAYS_FALSE_FALSE have_svnversion _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 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 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 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'
    476476ac_subst_files=''
    477477
     
    16391639
    16401640
    1641 #Set the project's version number
    1642 if test "x" != x; then
     1641# We set the following variable so that we know later in AC_COIN_FINALIZE
     1642# that we are in a project main directory
     1643coin_projectdir=yes
     1644
     1645# Set the project's version number
     1646if test "xHSL" != x; then
    16431647
    16441648cat >>confdefs.h <<_ACEOF
    1645 #define _VERSION "$PACKAGE_VERSION"
     1649#define HSL_VERSION "$PACKAGE_VERSION"
    16461650_ACEOF
    16471651
    16481652fi
    16491653
    1650 #Set the project's SVN revision number
     1654# Set the project's SVN revision number
    16511655# Extract the first word of "svnversion", so it can be a program name with args.
    16521656set dummy svnversion; ac_word=$2
     
    16851689fi
    16861690
    1687 if test "x$have_svnversion" = xyes && test "x" != x; then
    1688 
    1689   _SVN_REV=`cd $srcdir/$coin_has_ ; svnversion`
    1690   if test $_SVN_REV != exported; then
     1691if test "x$have_svnversion" = xyes && test "xHSL" != x; then
     1692
     1693  HSL_SVN_REV=`cd $srcdir/$coin_has_hsl ; svnversion`
     1694  if test $HSL_SVN_REV != exported; then
    16911695
    16921696cat >>confdefs.h <<_ACEOF
    1693 #define _SVN_REV "$_SVN_REV"
     1697#define HSL_SVN_REV "$HSL_SVN_REV"
    16941698_ACEOF
    16951699
     
    16971701fi
    16981702
    1699 # We set the following variable so that we know later in AC_COIN_FINALIZE
    1700 # that we are in a project main directory
    1701 coin_projectdir=yes
    1702 
    1703 # Check if a library version is set for libtool
     1703# Capture libtool library version, if given.
    17041704
    17051705
     
    27872787        ;;
    27882788      *)
    2789         coin_opt_cflags="-O3 -fomit-frame-pointer"
     2789        coin_opt_cflags="-O3"
    27902790        coin_add_cflags="-pipe"
    27912791        coin_dbg_cflags="-g"
     
    35463546
    35473547  if test "$G77" = "yes"; then
    3548     coin_opt_fflags="-O3 -fomit-frame-pointer"
     3548    coin_opt_fflags="-O3"
    35493549    coin_add_fflags="-pipe"
    35503550    coin_dbg_fflags="-g"
     
    2296022960s,@ALWAYS_FALSE_FALSE@,$ALWAYS_FALSE_FALSE,;t t
    2296122961s,@have_svnversion@,$have_svnversion,;t t
    22962 s,@_SVN_REV@,$_SVN_REV,;t t
     22962s,@HSL_SVN_REV@,$HSL_SVN_REV,;t t
    2296322963s,@build@,$build,;t t
    2296422964s,@build_cpu@,$build_cpu,;t t
  • ThirdParty/HSL/trunk/configure.ac

    r1548 r1586  
    3333AC_PREFIX_DEFAULT([`pwd`])
    3434
    35 AC_COIN_PROJECTDIR_INIT
     35AC_COIN_PROJECTDIR_INIT(HSL)
    3636
    3737#############################################################################
Note: See TracChangeset for help on using the changeset viewer.