Changeset 1582 for ThirdParty/ASL/trunk


Ignore:
Timestamp:
Jun 19, 2010 1:47:12 PM (10 years ago)
Author:
stefan
Message:

give project name to COIN_PROJECTDIR_INIT; rerun autotools

Location:
ThirdParty/ASL/trunk
Files:
3 edited

Legend:

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

    r1565 r1582  
    115115AR = @AR@
    116116ASLMAKEFLAGS = @ASLMAKEFLAGS@
     117ASL_SVN_REV = @ASL_SVN_REV@
    117118AUTOCONF = @AUTOCONF@
    118119AUTOHEADER = @AUTOHEADER@
     
    186187VERSION = @VERSION@
    187188VPATH_DISTCLEANFILES = @VPATH_DISTCLEANFILES@
    188 _SVN_REV = @_SVN_REV@
    189189abs_bin_dir = @abs_bin_dir@
    190190abs_include_dir = @abs_include_dir@
  • ThirdParty/ASL/trunk/configure

    r1550 r1582  
    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 build build_cpu build_vendor build_os ADDLIBS FADDLIBS ALWAYS_FALSE_TRUE ALWAYS_FALSE_FALSE have_svnversion _SVN_REV EGREP LN_S CDEFS ADD_CFLAGS DBG_CFLAGS OPT_CFLAGS sol_cc_compiler CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT MPICC 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 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 PKG_CONFIG ac_pt_PKG_CONFIG COIN_HAS_PKGCONFIG_TRUE COIN_HAS_PKGCONFIG_FALSE COIN_PKG_CONFIG_PATH AMPLSOLVER_A ABSPATH_AMPLSOLVER_INSTALLED ABSPATH_AMPLSOLVER_UNINSTALLED ASLMAKEFLAGS MSVC_COMPILE_TRUE MSVC_COMPILE_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 build build_cpu build_vendor build_os ADDLIBS FADDLIBS ALWAYS_FALSE_TRUE ALWAYS_FALSE_FALSE have_svnversion ASL_SVN_REV EGREP LN_S CDEFS ADD_CFLAGS DBG_CFLAGS OPT_CFLAGS sol_cc_compiler CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT MPICC 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 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 PKG_CONFIG ac_pt_PKG_CONFIG COIN_HAS_PKGCONFIG_TRUE COIN_HAS_PKGCONFIG_FALSE COIN_PKG_CONFIG_PATH AMPLSOLVER_A ABSPATH_AMPLSOLVER_INSTALLED ABSPATH_AMPLSOLVER_UNINSTALLED ASLMAKEFLAGS MSVC_COMPILE_TRUE MSVC_COMPILE_FALSE LIBEXT VPATH_DISTCLEANFILES ABSBUILDDIR LIBOBJS LTLIBOBJS'
    476476ac_subst_files=''
    477477
     
    16761676
    16771677
    1678 #Set the project's version number
    1679 if test "x" != x; then
     1678# We set the following variable so that we know later in AC_COIN_FINALIZE
     1679# that we are in a project main directory
     1680coin_projectdir=yes
     1681
     1682# Set the project's version number
     1683if test "xASL" != x; then
    16801684
    16811685cat >>confdefs.h <<_ACEOF
    1682 #define _VERSION "$PACKAGE_VERSION"
     1686#define ASL_VERSION "$PACKAGE_VERSION"
    16831687_ACEOF
    16841688
    16851689fi
    16861690
    1687 #Set the project's SVN revision number
     1691# Set the project's SVN revision number
    16881692# Extract the first word of "svnversion", so it can be a program name with args.
    16891693set dummy svnversion; ac_word=$2
     
    17221726fi
    17231727
    1724 if test "x$have_svnversion" = xyes && test "x" != x; then
    1725 
    1726   _SVN_REV=`cd $srcdir/$coin_has_ ; svnversion`
    1727   if test $_SVN_REV != exported; then
     1728if test "x$have_svnversion" = xyes && test "xASL" != x; then
     1729
     1730  ASL_SVN_REV=`cd $srcdir/$coin_has_asl ; svnversion`
     1731  if test $ASL_SVN_REV != exported; then
    17281732
    17291733cat >>confdefs.h <<_ACEOF
    1730 #define _SVN_REV "$_SVN_REV"
     1734#define ASL_SVN_REV "$ASL_SVN_REV"
    17311735_ACEOF
    17321736
     
    17341738fi
    17351739
    1736 # We set the following variable so that we know later in AC_COIN_FINALIZE
    1737 # that we are in a project main directory
    1738 coin_projectdir=yes
    1739 
    1740 # Check if a library version is set for libtool
     1740# Capture libtool library version, if given.
    17411741
    17421742
     
    27822782        ;;
    27832783      *)
    2784         coin_opt_cflags="-O3 -fomit-frame-pointer"
     2784        coin_opt_cflags="-O3"
    27852785        coin_add_cflags="-pipe"
    27862786        coin_dbg_cflags="-g"
     
    2111321113s,@ALWAYS_FALSE_FALSE@,$ALWAYS_FALSE_FALSE,;t t
    2111421114s,@have_svnversion@,$have_svnversion,;t t
    21115 s,@_SVN_REV@,$_SVN_REV,;t t
     21115s,@ASL_SVN_REV@,$ASL_SVN_REV,;t t
    2111621116s,@EGREP@,$EGREP,;t t
    2111721117s,@LN_S@,$LN_S,;t t
  • ThirdParty/ASL/trunk/configure.ac

    r1550 r1582  
    4040
    4141# A bit of initial setup.
    42 AC_COIN_PROJECTDIR_INIT
     42AC_COIN_PROJECTDIR_INIT(ASL)
    4343
    4444# Turn off warnings and pedantic mode since they could make trouble on some
Note: See TracChangeset for help on using the changeset viewer.