Changeset 1587


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

give project name to COIN_PROJECTDIR_INIT; rerun autotools

Location:
ThirdParty/Lapack/trunk
Files:
3 edited

Legend:

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

    r1570 r1587  
    171171INSTALL_SCRIPT = @INSTALL_SCRIPT@
    172172INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
     173LAPACK_SVN_REV = @LAPACK_SVN_REV@
    173174LDFLAGS = @LDFLAGS@
    174175LIBEXT = @LIBEXT@
     
    204205VERSION = @VERSION@
    205206VPATH_DISTCLEANFILES = @VPATH_DISTCLEANFILES@
    206 _SVN_REV = @_SVN_REV@
    207207abs_bin_dir = @abs_bin_dir@
    208208abs_include_dir = @abs_include_dir@
  • ThirdParty/Lapack/trunk/configure

    r1552 r1587  
    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 FLIBS PKG_CONFIG ac_pt_PKG_CONFIG COIN_HAS_PKGCONFIG_TRUE COIN_HAS_PKGCONFIG_FALSE COIN_PKG_CONFIG_PATH DLAMCH_FFLAGS EGREP 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 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 LAPACK_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 FLIBS PKG_CONFIG ac_pt_PKG_CONFIG COIN_HAS_PKGCONFIG_TRUE COIN_HAS_PKGCONFIG_FALSE COIN_PKG_CONFIG_PATH DLAMCH_FFLAGS EGREP 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 LIBEXT VPATH_DISTCLEANFILES ABSBUILDDIR LIBOBJS LTLIBOBJS'
    476476ac_subst_files=''
    477477
     
    16321632
    16331633
    1634 #Set the project's version number
    1635 if test "x" != x; then
     1634# We set the following variable so that we know later in AC_COIN_FINALIZE
     1635# that we are in a project main directory
     1636coin_projectdir=yes
     1637
     1638# Set the project's version number
     1639if test "xLapack" != x; then
    16361640
    16371641cat >>confdefs.h <<_ACEOF
    1638 #define _VERSION "$PACKAGE_VERSION"
     1642#define LAPACK_VERSION "$PACKAGE_VERSION"
    16391643_ACEOF
    16401644
    16411645fi
    16421646
    1643 #Set the project's SVN revision number
     1647# Set the project's SVN revision number
    16441648# Extract the first word of "svnversion", so it can be a program name with args.
    16451649set dummy svnversion; ac_word=$2
     
    16781682fi
    16791683
    1680 if test "x$have_svnversion" = xyes && test "x" != x; then
    1681 
    1682   _SVN_REV=`cd $srcdir/$coin_has_ ; svnversion`
    1683   if test $_SVN_REV != exported; then
     1684if test "x$have_svnversion" = xyes && test "xLapack" != x; then
     1685
     1686  LAPACK_SVN_REV=`cd $srcdir/$coin_has_lapack ; svnversion`
     1687  if test $LAPACK_SVN_REV != exported; then
    16841688
    16851689cat >>confdefs.h <<_ACEOF
    1686 #define _SVN_REV "$_SVN_REV"
     1690#define LAPACK_SVN_REV "$LAPACK_SVN_REV"
    16871691_ACEOF
    16881692
     
    16901694fi
    16911695
    1692 # We set the following variable so that we know later in AC_COIN_FINALIZE
    1693 # that we are in a project main directory
    1694 coin_projectdir=yes
    1695 
    1696 # Check if a library version is set for libtool
     1696# Capture libtool library version, if given.
    16971697
    16981698
     
    27732773        ;;
    27742774      *)
    2775         coin_opt_cflags="-O3 -fomit-frame-pointer"
     2775        coin_opt_cflags="-O3"
    27762776        coin_add_cflags="-pipe"
    27772777        coin_dbg_cflags="-g"
     
    35303530
    35313531  if test "$G77" = "yes"; then
    3532     coin_opt_fflags="-O3 -fomit-frame-pointer"
     3532    coin_opt_fflags="-O3"
    35333533    coin_add_fflags="-pipe"
    35343534    coin_dbg_fflags="-g"
     
    2240922409s,@ALWAYS_FALSE_FALSE@,$ALWAYS_FALSE_FALSE,;t t
    2241022410s,@have_svnversion@,$have_svnversion,;t t
    22411 s,@_SVN_REV@,$_SVN_REV,;t t
     22411s,@LAPACK_SVN_REV@,$LAPACK_SVN_REV,;t t
    2241222412s,@build@,$build,;t t
    2241322413s,@build_cpu@,$build_cpu,;t t
  • ThirdParty/Lapack/trunk/configure.ac

    r1548 r1587  
    3232AC_PREFIX_DEFAULT([`pwd`])
    3333
    34 AC_COIN_PROJECTDIR_INIT
     34AC_COIN_PROJECTDIR_INIT(Lapack)
    3535
    3636#############################################################################
Note: See TracChangeset for help on using the changeset viewer.