Changeset 1589


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

give project name to COIN_PROJECTDIR_INIT; rerun autotools

Location:
ThirdParty/Mumps/trunk
Files:
3 edited

Legend:

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

    r1572 r1589  
    215215MUMPSOBJDIR = @MUMPSOBJDIR@
    216216MUMPSSRCDIR = @MUMPSSRCDIR@
     217MUMPS_SVN_REV = @MUMPS_SVN_REV@
    217218MY_DEFS = @MY_DEFS@
    218219MY_FDEFS = @MY_FDEFS@
     
    236237VERSION = @VERSION@
    237238VPATH_DISTCLEANFILES = @VPATH_DISTCLEANFILES@
    238 _SVN_REV = @_SVN_REV@
    239239abs_bin_dir = @abs_bin_dir@
    240240abs_include_dir = @abs_include_dir@
  • ThirdParty/Mumps/trunk/configure

    r1564 r1589  
    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 CPP EGREP MY_DEFS 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 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 PKG_CONFIG ac_pt_PKG_CONFIG COIN_HAS_PKGCONFIG_TRUE COIN_HAS_PKGCONFIG_FALSE COIN_PKG_CONFIG_PATH BLAS_LIBS BLAS_CFLAGS BLAS_DATA REQUIREDPACKAGES COIN_HAS_BLAS_TRUE COIN_HAS_BLAS_FALSE METIS_LIBS METIS_CFLAGS METIS_DATA COIN_HAS_METIS_TRUE COIN_HAS_METIS_FALSE MUMPSDIR MUMPSOBJDIR MUMPSSRCDIR MY_FDEFS 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 MUMPS_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 CPP EGREP MY_DEFS 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 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 PKG_CONFIG ac_pt_PKG_CONFIG COIN_HAS_PKGCONFIG_TRUE COIN_HAS_PKGCONFIG_FALSE COIN_PKG_CONFIG_PATH BLAS_LIBS BLAS_CFLAGS BLAS_DATA REQUIREDPACKAGES COIN_HAS_BLAS_TRUE COIN_HAS_BLAS_FALSE METIS_LIBS METIS_CFLAGS METIS_DATA COIN_HAS_METIS_TRUE COIN_HAS_METIS_FALSE MUMPSDIR MUMPSOBJDIR MUMPSSRCDIR MY_FDEFS LIBEXT VPATH_DISTCLEANFILES ABSBUILDDIR LIBOBJS LTLIBOBJS'
    476476ac_subst_files=''
    477477
     
    16331633
    16341634
    1635 #Set the project's version number
    1636 if test "x" != x; then
     1635# We set the following variable so that we know later in AC_COIN_FINALIZE
     1636# that we are in a project main directory
     1637coin_projectdir=yes
     1638
     1639# Set the project's version number
     1640if test "xMumps" != x; then
    16371641
    16381642cat >>confdefs.h <<_ACEOF
    1639 #define _VERSION "$PACKAGE_VERSION"
     1643#define MUMPS_VERSION "$PACKAGE_VERSION"
    16401644_ACEOF
    16411645
    16421646fi
    16431647
    1644 #Set the project's SVN revision number
     1648# Set the project's SVN revision number
    16451649# Extract the first word of "svnversion", so it can be a program name with args.
    16461650set dummy svnversion; ac_word=$2
     
    16791683fi
    16801684
    1681 if test "x$have_svnversion" = xyes && test "x" != x; then
    1682 
    1683   _SVN_REV=`cd $srcdir/$coin_has_ ; svnversion`
    1684   if test $_SVN_REV != exported; then
     1685if test "x$have_svnversion" = xyes && test "xMumps" != x; then
     1686
     1687  MUMPS_SVN_REV=`cd $srcdir/$coin_has_mumps ; svnversion`
     1688  if test $MUMPS_SVN_REV != exported; then
    16851689
    16861690cat >>confdefs.h <<_ACEOF
    1687 #define _SVN_REV "$_SVN_REV"
     1691#define MUMPS_SVN_REV "$MUMPS_SVN_REV"
    16881692_ACEOF
    16891693
     
    16911695fi
    16921696
    1693 # We set the following variable so that we know later in AC_COIN_FINALIZE
    1694 # that we are in a project main directory
    1695 coin_projectdir=yes
    1696 
    1697 # Check if a library version is set for libtool
     1697# Capture libtool library version, if given.
    16981698
    16991699
     
    27752775        ;;
    27762776      *)
    2777         coin_opt_cflags="-O3 -fomit-frame-pointer"
     2777        coin_opt_cflags="-O3"
    27782778        coin_add_cflags="-pipe"
    27792779        coin_dbg_cflags="-g"
     
    35343534
    35353535  if test "$G77" = "yes"; then
    3536     coin_opt_fflags="-O3 -fomit-frame-pointer"
     3536    coin_opt_fflags="-O3"
    35373537    coin_add_fflags="-pipe"
    35383538    coin_dbg_fflags="-g"
     
    2524025240s,@ALWAYS_FALSE_FALSE@,$ALWAYS_FALSE_FALSE,;t t
    2524125241s,@have_svnversion@,$have_svnversion,;t t
    25242 s,@_SVN_REV@,$_SVN_REV,;t t
     25242s,@MUMPS_SVN_REV@,$MUMPS_SVN_REV,;t t
    2524325243s,@build@,$build,;t t
    2524425244s,@build_cpu@,$build_cpu,;t t
  • ThirdParty/Mumps/trunk/configure.ac

    r1548 r1589  
    3131AC_PREFIX_DEFAULT([`pwd`])
    3232
    33 AC_COIN_PROJECTDIR_INIT
     33AC_COIN_PROJECTDIR_INIT(Mumps)
    3434
    3535#############################################################################
Note: See TracChangeset for help on using the changeset viewer.