Changeset 3986


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

rerun autotools

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

Legend:

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

    r3961 r3986  
    355355METIS_LFLAGS = @METIS_LFLAGS@
    356356METIS_LFLAGS_NOPC = @METIS_LFLAGS_NOPC@
    357 METIS_SVN_REV = @METIS_SVN_REV@
    358357MKDIR_P = @MKDIR_P@
    359358NM = @NM@
     
    401400dvidir = @dvidir@
    402401exec_prefix = @exec_prefix@
    403 have_svnversion = @have_svnversion@
    404402host = @host@
    405403host_alias = @host_alias@
  • ThirdParty/Metis/branches/autotools-update/configure

    r3982 r3986  
    728728ALWAYS_FALSE_FALSE
    729729ALWAYS_FALSE_TRUE
    730 METIS_SVN_REV
    731 have_svnversion
    732730target_alias
    733731host_alias
     
    14141412  --disable-FEATURE       do not include FEATURE (same as --enable-FEATURE=no)
    14151413  --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
    1416   --enable-msvc           Look for and allow only Intel/Microsoft compilers on
    1417                           MinGW/MSys/Cygwin.
    1418   --enable-debug          Build with debugging symbols.
     1414  --enable-msvc           look for and allow only Intel/Microsoft compilers on
     1415                          MinGW/MSys/Cygwin
     1416  --enable-debug          build debugging symbols and turn off compiler
     1417                          optimization
    14191418  --enable-silent-rules   less verbose build output (undo: "make V=1")
    14201419  --disable-silent-rules  verbose build output (undo: "make V=0")
     
    22632262
    22642263
     2264  # We want --enable-msvc setup and checked
     2265
     2266
    22652267  # Check whether --enable-debug was given.
    22662268if test "${enable_debug+set}" = set; then :
     
    22692271  enable_debug=no
    22702272fi
    2271 
    2272 
    2273 
    2274 # We want --enable-msvc setup and checked. Also --enable-debug
    2275 
    2276 
    22772273
    22782274
     
    28532849
    28542850
     2851  # break up package version number in major.minor.release
     2852  # AC_PACKAGE_VERSION is defined by AC_INIT
     2853
     2854
     2855
     2856
     2857  # ac-define AC_PACKAGE_VERSION macros, use 9999 for missing values
    28552858
    28562859cat >>confdefs.h <<_ACEOF
    2857 #define METIS_VERSION "$PACKAGE_VERSION"
     2860#define METIS_VERSION "trunk"
    28582861_ACEOF
    28592862
    28602863
    2861 # Parse package version, assuming major.minor.release. PACKAGE_VERSION is set
    2862 # by AC_INIT. Force components to 9999 if they're empty; this deals with
    2863 # things like `trunk' and other nonstandard forms.
    2864 
    2865   coin_majorver=`echo $PACKAGE_VERSION | sed -n -e 's/^\([0-9]*\).*/\1/gp'`
    2866   coin_minorver=`echo $PACKAGE_VERSION | sed -n -e 's/^[0-9]*\.\([0-9]*\).*/\1/gp'`
    2867   coin_releasever=`echo $PACKAGE_VERSION | sed -n -e 's/^[0-9]*\.[0-9]*\.\([0-9]*\).*/\1/gp'`
    2868   test -z "$coin_majorver"   && coin_majorver=9999
    2869   test -z "$coin_minorver"   && coin_minorver=9999
    2870   test -z "$coin_releasever" && coin_releasever=9999
    2871 
    28722864cat >>confdefs.h <<_ACEOF
    2873 #define METIS_VERSION_MAJOR $coin_majorver
     2865#define METIS_VERSION_MAJOR 9999
    28742866_ACEOF
    28752867
    28762868
    28772869cat >>confdefs.h <<_ACEOF
    2878 #define METIS_VERSION_MINOR $coin_minorver
     2870#define METIS_VERSION_MINOR 9999
    28792871_ACEOF
    28802872
    28812873
    28822874cat >>confdefs.h <<_ACEOF
    2883 #define METIS_VERSION_RELEASE $coin_releasever
     2875#define METIS_VERSION_RELEASE 9999
    28842876_ACEOF
    28852877
    28862878
    2887 # Create a variable set to the upper case version of the project name
    2888 
    2889   COIN_PRJCT=METIS
    2890 
    2891 # Set the project's SVN revision number. The complicated sed expression
    2892 # (made worse by quadrigraphs) ensures that things like 4123:4168MS end up
    2893 # as a single number.
    2894 
    2895   # Extract the first word of "svnversion", so it can be a program name with args.
    2896 set dummy svnversion; ac_word=$2
    2897 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
    2898 $as_echo_n "checking for $ac_word... " >&6; }
    2899 if ${ac_cv_prog_have_svnversion+:} false; then :
    2900   $as_echo_n "(cached) " >&6
    2901 else
    2902   if test -n "$have_svnversion"; then
    2903   ac_cv_prog_have_svnversion="$have_svnversion" # Let the user override the test.
    2904 else
    2905 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
    2906 for as_dir in $PATH
    2907 do
    2908   IFS=$as_save_IFS
    2909   test -z "$as_dir" && as_dir=.
    2910     for ac_exec_ext in '' $ac_executable_extensions; do
    2911   if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
    2912     ac_cv_prog_have_svnversion="yes"
    2913     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
    2914     break 2
    2915   fi
    2916 done
    2917   done
    2918 IFS=$as_save_IFS
    2919 
    2920   test -z "$ac_cv_prog_have_svnversion" && ac_cv_prog_have_svnversion="no"
    2921 fi
    2922 fi
    2923 have_svnversion=$ac_cv_prog_have_svnversion
    2924 if test -n "$have_svnversion"; then
    2925   { $as_echo "$as_me:${as_lineno-$LINENO}: result: $have_svnversion" >&5
    2926 $as_echo "$have_svnversion" >&6; }
    2927 else
    2928   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
    2929 $as_echo "no" >&6; }
    2930 fi
    2931 
    2932 
    2933   if test "x$have_svnversion" = xyes; then
    2934 
    2935     svn_rev_tmp=`LANG=en_EN svnversion $srcdir 2>/dev/null`
    2936     if test "x$svn_rev_tmp" != xexported -a "x$svn_rev_tmp" != x -a "x$svn_rev_tmp" != "xUnversioned directory"; then
    2937       METIS_SVN_REV=`echo $svn_rev_tmp | sed -n -e 's/^[0-9]*://' -e 's/\([0-9]\)[^0-9]*$/\1/p'`
    2938 
    2939 cat >>confdefs.h <<_ACEOF
    2940 #define METIS_SVN_REV $METIS_SVN_REV
    2941 _ACEOF
    2942 
    2943     fi
    2944   fi
    2945 
    2946 
    2947 
    2948 # Capture the libtool library version, if given.
     2879
    29492880
    29502881
     
    77607691done
    77617692
    7762 
    7763 # (lh, 180302) Sadly, we can't use the obvious libtool macros
    7764 # (AC_{ENABLE,DISABLE}_{SHARED,STATIC}, nor parameters to LT_INIT,
    7765 # precisely because these macros record the default behaviour by defining
    7766 # a macro, _LT_ENABLE_{SHARED,STATIC}_DEFAULT. No shell code involved, hence
    7767 # any shell conditional has no effect. Either we trust libtool or we need
    7768 # something more inventive. The relevant libtool macros are in ltoptions.m4,
    7769 # _LT_ENABLE_SHARED and _LT_ENABLE_STATIC.
    7770 # That is, something like the following will not work:
    7771 # case $host_os in
    7772 #   cygwin* | mingw* | msys* ) AC_DISABLE_SHARED  ;;
    7773 #   *) AC_DISABLE_STATIC ;;
    7774 # esac
    77757693
    77767694# Create libtool.
     
    1209112009#    and explicitly dll-exporting them, leading to warnings about duplicates
    1209212010#    regarding those that are properly marked for dll-export in the source.
     12011#
     12012# Patch libtool also to circumbent some issues when using MinGW (Msys+GCC).
     12013# 1. Relax check which libraries can be used when linking a DLL.
     12014#    libtool's func_mode_link() would reject linking MinGW system libraries,
     12015#    e.g., -lmingw32, when building a DLL, because it does not find this
     12016#    library in the installation path, and then falls back to build only
     12017#    static libraries. Setting deplibs_check_method=pass_all will avoid
     12018#    this faulty check.
    1209312019
    1209412020  case "$AR" in
    1209512021    *lib* | *LIB* )
    12096       ac_config_commands="$ac_config_commands libtoolpatch"
    12097 
     12022      ac_config_commands="$ac_config_commands libtoolclpatch"
     12023
     12024      ;;
     12025    * )
     12026      case $build in
     12027        *-mingw* )
     12028          ac_config_commands="$ac_config_commands libtoolmingwpatch"
     12029
     12030        ;;
     12031      esac
    1209812032      ;;
    1209912033  esac
    1210012034
    12101 # Set up LT_LDFLAGS. Add the library version string to LT_LDFLAGS, if one
    12102 # is supplied.
    12103 
    12104 
    12105   { $as_echo "$as_me:${as_lineno-$LINENO}: checking if the library version is set" >&5
    12106 $as_echo_n "checking if the library version is set... " >&6; }
    12107   if test x"$coin_libversion" != x ; then
    12108     LT_LDFLAGS="$LT_LDFLAGS -version-info $coin_libversion"
    12109     { $as_echo "$as_me:${as_lineno-$LINENO}: result: $coin_libversion" >&5
    12110 $as_echo "$coin_libversion" >&6; }
    12111   else
    12112     { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
    12113 $as_echo "no" >&6; }
    12114   fi
     12035  # Set up LT_LDFLAGS.
     12036
     12037
     12038  # Use the libtool library info, if defined, otherwise use the project version info,
     12039  # if a full major.minor.release number was available
     12040
    1211512041
    1211612042  # shared libraries should have no undefined symbols
     
    1330213228    "depfiles") CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;
    1330313229    "libtool") CONFIG_COMMANDS="$CONFIG_COMMANDS libtool" ;;
    13304     "libtoolpatch") CONFIG_COMMANDS="$CONFIG_COMMANDS libtoolpatch" ;;
     13230    "libtoolclpatch") CONFIG_COMMANDS="$CONFIG_COMMANDS libtoolclpatch" ;;
     13231    "libtoolmingwpatch") CONFIG_COMMANDS="$CONFIG_COMMANDS libtoolmingwpatch" ;;
    1330513232    "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
    1330613233    "coinmetis.pc") CONFIG_FILES="$CONFIG_FILES coinmetis.pc" ;;
     
    1437114298
    1437214299 ;;
    14373     "libtoolpatch":C) sed -e 's|AR_FLAGS |AR_FLAGS|g' \
     14300    "libtoolclpatch":C) sed -e 's|AR_FLAGS |AR_FLAGS|g' \
    1437414301             -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' \
    1437514302             -e '/^deplibs_check_method/s/.*/deplibs_check_method="pass_all"/g' \
     
    1437814305         mv libtool.tmp libtool
    1437914306         chmod 755 libtool ;;
     14307    "libtoolmingwpatch":C) sed -e '/^deplibs_check_method/s/.*/deplibs_check_method="pass_all"/g' libtool > libtool.tmp
     14308             mv libtool.tmp libtool
     14309             chmod 755 libtool ;;
    1438014310
    1438114311  esac
     
    1441714347
    1441814348
    14419   { $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
    14420 $as_echo "$as_me: In case of trouble, first consult the troubleshooting page at https://projects.coin-or.org/BuildTools/wiki/user-troubleshooting" >&6;}
     14349  #AC_MSG_NOTICE([In case of trouble, first consult the troubleshooting page at https://projects.coin-or.org/BuildTools/wiki/user-troubleshooting])
    1442114350  { $as_echo "$as_me:${as_lineno-$LINENO}: Configuration of $PACKAGE_NAME successful" >&5
    1442214351$as_echo "$as_me: Configuration of $PACKAGE_NAME successful" >&6;}
    1442314352
    14424 
Note: See TracChangeset for help on using the changeset viewer.