Changeset 3985


Ignore:
Timestamp:
Sep 4, 2019 12:33:26 PM (6 weeks ago)
Author:
stefan
Message:

rerun autotools

Location:
ThirdParty/ASL/branches/autotools-update
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • ThirdParty/ASL/branches/autotools-update/Makefile.in

    r3980 r3985  
    309309ASL_LFLAGS = @ASL_LFLAGS@
    310310ASL_LFLAGS_NOPC = @ASL_LFLAGS_NOPC@
    311 ASL_SVN_REV = @ASL_SVN_REV@
    312311AUTOCONF = @AUTOCONF@
    313312AUTOHEADER = @AUTOHEADER@
     
    397396dvidir = @dvidir@
    398397exec_prefix = @exec_prefix@
    399 have_svnversion = @have_svnversion@
    400398host = @host@
    401399host_alias = @host_alias@
  • ThirdParty/ASL/branches/autotools-update/configure

    r3981 r3985  
    729729ALWAYS_FALSE_FALSE
    730730ALWAYS_FALSE_TRUE
    731 ASL_SVN_REV
    732 have_svnversion
    733731target_alias
    734732host_alias
     
    14151413  --disable-FEATURE       do not include FEATURE (same as --enable-FEATURE=no)
    14161414  --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
    1417   --enable-msvc           Look for and allow only Intel/Microsoft compilers on
    1418                           MinGW/MSys/Cygwin.
    1419   --enable-debug          Build with debugging symbols.
     1415  --enable-msvc           look for and allow only Intel/Microsoft compilers on
     1416                          MinGW/MSys/Cygwin
     1417  --enable-debug          build debugging symbols and turn off compiler
     1418                          optimization
    14201419  --enable-silent-rules   less verbose build output (undo: "make V=1")
    14211420  --disable-silent-rules  verbose build output (undo: "make V=0")
     
    22272226
    22282227
     2228  # We want --enable-msvc setup and checked
     2229
     2230
    22292231  # Check whether --enable-debug was given.
    22302232if test "${enable_debug+set}" = set; then :
     
    22332235  enable_debug=no
    22342236fi
    2235 
    2236 
    2237 
    2238 # We want --enable-msvc setup and checked. Also --enable-debug
    2239 
    2240 
    22412237
    22422238
     
    28172813
    28182814
     2815  # break up package version number in major.minor.release
     2816  # AC_PACKAGE_VERSION is defined by AC_INIT
     2817
     2818
     2819
     2820
     2821  # ac-define AC_PACKAGE_VERSION macros, use 9999 for missing values
    28192822
    28202823cat >>confdefs.h <<_ACEOF
    2821 #define ASL_VERSION "$PACKAGE_VERSION"
     2824#define ASL_VERSION "trunk"
    28222825_ACEOF
    28232826
    28242827
    2825 # Parse package version, assuming major.minor.release. PACKAGE_VERSION is set
    2826 # by AC_INIT. Force components to 9999 if they're empty; this deals with
    2827 # things like `trunk' and other nonstandard forms.
    2828 
    2829   coin_majorver=`echo $PACKAGE_VERSION | sed -n -e 's/^\([0-9]*\).*/\1/gp'`
    2830   coin_minorver=`echo $PACKAGE_VERSION | sed -n -e 's/^[0-9]*\.\([0-9]*\).*/\1/gp'`
    2831   coin_releasever=`echo $PACKAGE_VERSION | sed -n -e 's/^[0-9]*\.[0-9]*\.\([0-9]*\).*/\1/gp'`
    2832   test -z "$coin_majorver"   && coin_majorver=9999
    2833   test -z "$coin_minorver"   && coin_minorver=9999
    2834   test -z "$coin_releasever" && coin_releasever=9999
    2835 
    28362828cat >>confdefs.h <<_ACEOF
    2837 #define ASL_VERSION_MAJOR $coin_majorver
     2829#define ASL_VERSION_MAJOR 9999
    28382830_ACEOF
    28392831
    28402832
    28412833cat >>confdefs.h <<_ACEOF
    2842 #define ASL_VERSION_MINOR $coin_minorver
     2834#define ASL_VERSION_MINOR 9999
    28432835_ACEOF
    28442836
    28452837
    28462838cat >>confdefs.h <<_ACEOF
    2847 #define ASL_VERSION_RELEASE $coin_releasever
     2839#define ASL_VERSION_RELEASE 9999
    28482840_ACEOF
    28492841
    28502842
    2851 # Create a variable set to the upper case version of the project name
    2852 
    2853   COIN_PRJCT=ASL
    2854 
    2855 # Set the project's SVN revision number. The complicated sed expression
    2856 # (made worse by quadrigraphs) ensures that things like 4123:4168MS end up
    2857 # as a single number.
    2858 
    2859   # Extract the first word of "svnversion", so it can be a program name with args.
    2860 set dummy svnversion; ac_word=$2
    2861 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
    2862 $as_echo_n "checking for $ac_word... " >&6; }
    2863 if ${ac_cv_prog_have_svnversion+:} false; then :
    2864   $as_echo_n "(cached) " >&6
    2865 else
    2866   if test -n "$have_svnversion"; then
    2867   ac_cv_prog_have_svnversion="$have_svnversion" # Let the user override the test.
    2868 else
    2869 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
    2870 for as_dir in $PATH
    2871 do
    2872   IFS=$as_save_IFS
    2873   test -z "$as_dir" && as_dir=.
    2874     for ac_exec_ext in '' $ac_executable_extensions; do
    2875   if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
    2876     ac_cv_prog_have_svnversion="yes"
    2877     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
    2878     break 2
    2879   fi
    2880 done
    2881   done
    2882 IFS=$as_save_IFS
    2883 
    2884   test -z "$ac_cv_prog_have_svnversion" && ac_cv_prog_have_svnversion="no"
    2885 fi
    2886 fi
    2887 have_svnversion=$ac_cv_prog_have_svnversion
    2888 if test -n "$have_svnversion"; then
    2889   { $as_echo "$as_me:${as_lineno-$LINENO}: result: $have_svnversion" >&5
    2890 $as_echo "$have_svnversion" >&6; }
    2891 else
    2892   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
    2893 $as_echo "no" >&6; }
    2894 fi
    2895 
    2896 
    2897   if test "x$have_svnversion" = xyes; then
    2898 
    2899     svn_rev_tmp=`LANG=en_EN svnversion $srcdir 2>/dev/null`
    2900     if test "x$svn_rev_tmp" != xexported -a "x$svn_rev_tmp" != x -a "x$svn_rev_tmp" != "xUnversioned directory"; then
    2901       ASL_SVN_REV=`echo $svn_rev_tmp | sed -n -e 's/^[0-9]*://' -e 's/\([0-9]\)[^0-9]*$/\1/p'`
    2902 
    2903 cat >>confdefs.h <<_ACEOF
    2904 #define ASL_SVN_REV $ASL_SVN_REV
    2905 _ACEOF
    2906 
    2907     fi
    2908   fi
    2909 
    2910 
    2911 
    2912 # Capture the libtool library version, if given.
     2843
    29132844
    29142845
     
    77207651done
    77217652
    7722 
    7723 # (lh, 180302) Sadly, we can't use the obvious libtool macros
    7724 # (AC_{ENABLE,DISABLE}_{SHARED,STATIC}, nor parameters to LT_INIT,
    7725 # precisely because these macros record the default behaviour by defining
    7726 # a macro, _LT_ENABLE_{SHARED,STATIC}_DEFAULT. No shell code involved, hence
    7727 # any shell conditional has no effect. Either we trust libtool or we need
    7728 # something more inventive. The relevant libtool macros are in ltoptions.m4,
    7729 # _LT_ENABLE_SHARED and _LT_ENABLE_STATIC.
    7730 # That is, something like the following will not work:
    7731 # case $host_os in
    7732 #   cygwin* | mingw* | msys* ) AC_DISABLE_SHARED  ;;
    7733 #   *) AC_DISABLE_STATIC ;;
    7734 # esac
    77357653
    77367654# Create libtool.
     
    1205111969#    and explicitly dll-exporting them, leading to warnings about duplicates
    1205211970#    regarding those that are properly marked for dll-export in the source.
     11971#
     11972# Patch libtool also to circumbent some issues when using MinGW (Msys+GCC).
     11973# 1. Relax check which libraries can be used when linking a DLL.
     11974#    libtool's func_mode_link() would reject linking MinGW system libraries,
     11975#    e.g., -lmingw32, when building a DLL, because it does not find this
     11976#    library in the installation path, and then falls back to build only
     11977#    static libraries. Setting deplibs_check_method=pass_all will avoid
     11978#    this faulty check.
    1205311979
    1205411980  case "$AR" in
    1205511981    *lib* | *LIB* )
    12056       ac_config_commands="$ac_config_commands libtoolpatch"
    12057 
     11982      ac_config_commands="$ac_config_commands libtoolclpatch"
     11983
     11984      ;;
     11985    * )
     11986      case $build in
     11987        *-mingw* )
     11988          ac_config_commands="$ac_config_commands libtoolmingwpatch"
     11989
     11990        ;;
     11991      esac
    1205811992      ;;
    1205911993  esac
    1206011994
    12061 # Set up LT_LDFLAGS. Add the library version string to LT_LDFLAGS, if one
    12062 # is supplied.
    12063 
    12064 
    12065   { $as_echo "$as_me:${as_lineno-$LINENO}: checking if the library version is set" >&5
    12066 $as_echo_n "checking if the library version is set... " >&6; }
    12067   if test x"$coin_libversion" != x ; then
    12068     LT_LDFLAGS="$LT_LDFLAGS -version-info $coin_libversion"
    12069     { $as_echo "$as_me:${as_lineno-$LINENO}: result: $coin_libversion" >&5
    12070 $as_echo "$coin_libversion" >&6; }
    12071   else
    12072     { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
    12073 $as_echo "no" >&6; }
    12074   fi
     11995  # Set up LT_LDFLAGS.
     11996
     11997
     11998  # Use the libtool library info, if defined, otherwise use the project version info,
     11999  # if a full major.minor.release number was available
     12000
    1207512001
    1207612002  # shared libraries should have no undefined symbols
     
    1339513321    "depfiles") CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;
    1339613322    "libtool") CONFIG_COMMANDS="$CONFIG_COMMANDS libtool" ;;
    13397     "libtoolpatch") CONFIG_COMMANDS="$CONFIG_COMMANDS libtoolpatch" ;;
     13323    "libtoolclpatch") CONFIG_COMMANDS="$CONFIG_COMMANDS libtoolclpatch" ;;
     13324    "libtoolmingwpatch") CONFIG_COMMANDS="$CONFIG_COMMANDS libtoolmingwpatch" ;;
    1339813325    "stdio1.h") CONFIG_LINKS="$CONFIG_LINKS stdio1.h:solvers/stdio1.h0" ;;
    1339913326    "fpinit.c") CONFIG_LINKS="$CONFIG_LINKS fpinit.c:solvers/fpinit.c" ;;
     
    1449814425
    1449914426 ;;
    14500     "libtoolpatch":C) sed -e 's|AR_FLAGS |AR_FLAGS|g' \
     14427    "libtoolclpatch":C) sed -e 's|AR_FLAGS |AR_FLAGS|g' \
    1450114428             -e '/$AR x/s/.*/( cd $f_ex_an_ar_dir ; for f in `$AR -nologo -list "$f_ex_an_ar_oldlib" | tr "\\r" " "` ; do lib -nologo -extract:$f "$f_ex_an_ar_oldlib"; done ); : \\/g' \
    1450214429             -e '/^deplibs_check_method/s/.*/deplibs_check_method="pass_all"/g' \
     
    1450514432         mv libtool.tmp libtool
    1450614433         chmod 755 libtool ;;
     14434    "libtoolmingwpatch":C) sed -e '/^deplibs_check_method/s/.*/deplibs_check_method="pass_all"/g' libtool > libtool.tmp
     14435             mv libtool.tmp libtool
     14436             chmod 755 libtool ;;
    1450714437
    1450814438  esac
     
    1454414474
    1454514475
    14546   { $as_echo "$as_me:${as_lineno-$LINENO}: In case of trouble, first consult the troubleshooting page at https://projects.coin-or.org/BuildTools/wiki/user-troubleshooting" >&5
    14547 $as_echo "$as_me: In case of trouble, first consult the troubleshooting page at https://projects.coin-or.org/BuildTools/wiki/user-troubleshooting" >&6;}
     14476  #AC_MSG_NOTICE([In case of trouble, first consult the troubleshooting page at https://projects.coin-or.org/BuildTools/wiki/user-troubleshooting])
    1454814477  { $as_echo "$as_me:${as_lineno-$LINENO}: Configuration of $PACKAGE_NAME successful" >&5
    1454914478$as_echo "$as_me: Configuration of $PACKAGE_NAME successful" >&6;}
    1455014479
    14551 
Note: See TracChangeset for help on using the changeset viewer.