Changeset 1584 for ThirdParty/FilterSQP


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

give project name to COIN_PROJECTDIR_INIT; rerun autotools

Location:
ThirdParty/FilterSQP/trunk
Files:
3 edited

Legend:

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

    r1567 r1584  
    152152FADDLIBS = @FADDLIBS@
    153153FFLAGS = @FFLAGS@
     154FILTERSQP_SVN_REV = @FILTERSQP_SVN_REV@
    154155FLIBS = @FLIBS@
    155156HAVE_EXTERNALS_FALSE = @HAVE_EXTERNALS_FALSE@
     
    192193VERSION = @VERSION@
    193194VPATH_DISTCLEANFILES = @VPATH_DISTCLEANFILES@
    194 _SVN_REV = @_SVN_REV@
    195195abs_bin_dir = @abs_bin_dir@
    196196abs_include_dir = @abs_include_dir@
  • ThirdParty/FilterSQP/trunk/configure

    r1552 r1584  
    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 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 FILTERSQP_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 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
     
    16291629
    16301630
    1631 #Set the project's version number
    1632 if test "x" != x; then
     1631# We set the following variable so that we know later in AC_COIN_FINALIZE
     1632# that we are in a project main directory
     1633coin_projectdir=yes
     1634
     1635# Set the project's version number
     1636if test "xFilterSQP" != x; then
    16331637
    16341638cat >>confdefs.h <<_ACEOF
    1635 #define _VERSION "$PACKAGE_VERSION"
     1639#define FILTERSQP_VERSION "$PACKAGE_VERSION"
    16361640_ACEOF
    16371641
    16381642fi
    16391643
    1640 #Set the project's SVN revision number
     1644# Set the project's SVN revision number
    16411645# Extract the first word of "svnversion", so it can be a program name with args.
    16421646set dummy svnversion; ac_word=$2
     
    16751679fi
    16761680
    1677 if test "x$have_svnversion" = xyes && test "x" != x; then
    1678 
    1679   _SVN_REV=`cd $srcdir/$coin_has_ ; svnversion`
    1680   if test $_SVN_REV != exported; then
     1681if test "x$have_svnversion" = xyes && test "xFilterSQP" != x; then
     1682
     1683  FILTERSQP_SVN_REV=`cd $srcdir/$coin_has_filtersqp ; svnversion`
     1684  if test $FILTERSQP_SVN_REV != exported; then
    16811685
    16821686cat >>confdefs.h <<_ACEOF
    1683 #define _SVN_REV "$_SVN_REV"
     1687#define FILTERSQP_SVN_REV "$FILTERSQP_SVN_REV"
    16841688_ACEOF
    16851689
     
    16871691fi
    16881692
    1689 # We set the following variable so that we know later in AC_COIN_FINALIZE
    1690 # that we are in a project main directory
    1691 coin_projectdir=yes
    1692 
    1693 # Check if a library version is set for libtool
     1693# Capture libtool library version, if given.
    16941694
    16951695
     
    27662766        ;;
    27672767      *)
    2768         coin_opt_cflags="-O3 -fomit-frame-pointer"
     2768        coin_opt_cflags="-O3"
    27692769        coin_add_cflags="-pipe"
    27702770        coin_dbg_cflags="-g"
     
    35233523
    35243524  if test "$G77" = "yes"; then
    3525     coin_opt_fflags="-O3 -fomit-frame-pointer"
     3525    coin_opt_fflags="-O3"
    35263526    coin_add_fflags="-pipe"
    35273527    coin_dbg_fflags="-g"
     
    2314123141s,@ALWAYS_FALSE_FALSE@,$ALWAYS_FALSE_FALSE,;t t
    2314223142s,@have_svnversion@,$have_svnversion,;t t
    23143 s,@_SVN_REV@,$_SVN_REV,;t t
     23143s,@FILTERSQP_SVN_REV@,$FILTERSQP_SVN_REV,;t t
    2314423144s,@build@,$build,;t t
    2314523145s,@build_cpu@,$build_cpu,;t t
  • ThirdParty/FilterSQP/trunk/configure.ac

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