Changeset 1588


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

give project name to COIN_PROJECTDIR_INIT; rerun autotools

Location:
ThirdParty/Metis/trunk
Files:
3 edited

Legend:

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

    r1571 r1588  
    189189MAKEINFO = @MAKEINFO@
    190190METISDIR = @METISDIR@
     191METIS_SVN_REV = @METIS_SVN_REV@
    191192MPICC = @MPICC@
    192193OBJEXT = @OBJEXT@
     
    207208VERSION = @VERSION@
    208209VPATH_DISTCLEANFILES = @VPATH_DISTCLEANFILES@
    209 _SVN_REV = @_SVN_REV@
    210210abs_bin_dir = @abs_bin_dir@
    211211abs_include_dir = @abs_include_dir@
  • ThirdParty/Metis/trunk/configure

    r1548 r1588  
    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 PKG_CONFIG ac_pt_PKG_CONFIG COIN_HAS_PKGCONFIG_TRUE COIN_HAS_PKGCONFIG_FALSE COIN_PKG_CONFIG_PATH 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 F77 FFLAGS ac_ct_F77 LIBTOOL ac_c_preproc_warn_flag ac_cxx_preproc_warn_flag RPATH_FLAGS LT_LDFLAGS METISDIR 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 METIS_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 PKG_CONFIG ac_pt_PKG_CONFIG COIN_HAS_PKGCONFIG_TRUE COIN_HAS_PKGCONFIG_FALSE COIN_PKG_CONFIG_PATH 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 F77 FFLAGS ac_ct_F77 LIBTOOL ac_c_preproc_warn_flag ac_cxx_preproc_warn_flag RPATH_FLAGS LT_LDFLAGS METISDIR LIBEXT VPATH_DISTCLEANFILES ABSBUILDDIR LIBOBJS LTLIBOBJS'
    476476ac_subst_files=''
    477477
     
    16051605
    16061606
    1607 #Set the project's version number
    1608 if test "x" != x; then
     1607# We set the following variable so that we know later in AC_COIN_FINALIZE
     1608# that we are in a project main directory
     1609coin_projectdir=yes
     1610
     1611# Set the project's version number
     1612if test "xMetis" != x; then
    16091613
    16101614cat >>confdefs.h <<_ACEOF
    1611 #define _VERSION "$PACKAGE_VERSION"
     1615#define METIS_VERSION "$PACKAGE_VERSION"
    16121616_ACEOF
    16131617
    16141618fi
    16151619
    1616 #Set the project's SVN revision number
     1620# Set the project's SVN revision number
    16171621# Extract the first word of "svnversion", so it can be a program name with args.
    16181622set dummy svnversion; ac_word=$2
     
    16511655fi
    16521656
    1653 if test "x$have_svnversion" = xyes && test "x" != x; then
    1654 
    1655   _SVN_REV=`cd $srcdir/$coin_has_ ; svnversion`
    1656   if test $_SVN_REV != exported; then
     1657if test "x$have_svnversion" = xyes && test "xMetis" != x; then
     1658
     1659  METIS_SVN_REV=`cd $srcdir/$coin_has_metis ; svnversion`
     1660  if test $METIS_SVN_REV != exported; then
    16571661
    16581662cat >>confdefs.h <<_ACEOF
    1659 #define _SVN_REV "$_SVN_REV"
     1663#define METIS_SVN_REV "$METIS_SVN_REV"
    16601664_ACEOF
    16611665
     
    16631667fi
    16641668
    1665 # We set the following variable so that we know later in AC_COIN_FINALIZE
    1666 # that we are in a project main directory
    1667 coin_projectdir=yes
    1668 
    1669 # Check if a library version is set for libtool
     1669# Capture libtool library version, if given.
    16701670
    16711671
     
    27472747        ;;
    27482748      *)
    2749         coin_opt_cflags="-O3 -fomit-frame-pointer"
     2749        coin_opt_cflags="-O3"
    27502750        coin_add_cflags="-pipe"
    27512751        coin_dbg_cflags="-g"
     
    2095020950s,@ALWAYS_FALSE_FALSE@,$ALWAYS_FALSE_FALSE,;t t
    2095120951s,@have_svnversion@,$have_svnversion,;t t
    20952 s,@_SVN_REV@,$_SVN_REV,;t t
     20952s,@METIS_SVN_REV@,$METIS_SVN_REV,;t t
    2095320953s,@build@,$build,;t t
    2095420954s,@build_cpu@,$build_cpu,;t t
  • ThirdParty/Metis/trunk/configure.ac

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