Changeset 3863


Ignore:
Timestamp:
Oct 16, 2018 12:54:15 PM (11 months ago)
Author:
stefan
Message:

rerun autotools

Location:
ThirdParty/Glpk/branches/autotools-update
Files:
3 edited

Legend:

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

    r3860 r3863  
    108108subdir = .
    109109ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
    110 am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
    111         $(top_srcdir)/configure.ac
     110am__aclocal_m4_deps = $(top_srcdir)/configure.ac
    112111am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
    113112        $(ACLOCAL_M4)
  • ThirdParty/Glpk/branches/autotools-update/config_glpk.h.in

    r3860 r3863  
    77#undef GLPK_VERSION
    88
    9 /* Major Version number of project */
     9/* Major version number of project. */
    1010#undef GLPK_VERSION_MAJOR
    1111
    12 /* Minor Version number of project */
     12/* Minor version number of project. */
    1313#undef GLPK_VERSION_MINOR
    1414
    15 /* Release Version number of project */
     15/* Release version number of project. */
    1616#undef GLPK_VERSION_RELEASE
    1717
  • ThirdParty/Glpk/branches/autotools-update/configure

    r3860 r3863  
    694694MAINTAINER_MODE_FALSE
    695695MAINTAINER_MODE_TRUE
    696 AM_BACKSLASH
    697 AM_DEFAULT_VERBOSITY
    698 AM_DEFAULT_V
    699 AM_V
    700696am__untar
    701697am__tar
     
    721717INSTALL_SCRIPT
    722718INSTALL_PROGRAM
     719AM_BACKSLASH
     720AM_DEFAULT_VERBOSITY
     721AM_DEFAULT_V
     722AM_V
    723723host_os
    724724host_vendor
     
    14261426  --disable-dependency-tracking
    14271427                          speeds up one-time build
    1428   --enable-shared[=PKGS]  build shared libraries [default=no]
    1429   --enable-static[=PKGS]  build static libraries [default=no]
     1428  --enable-shared[=PKGS]  build shared libraries [default=yes]
     1429  --enable-static[=PKGS]  build static libraries [default=yes]
    14301430  --enable-fast-install[=PKGS]
    14311431                          optimize for fast installation [default=yes]
     
    21752175
    21762176
    2177 # we want --enable-msvc setup and checked
    2178 
    2179 
    2180 # this macro should run before the compiler checks (doesn't seem to be sufficient for CFLAGS)
     2177# We want --enable-msvc setup and checked
     2178
     2179
     2180
     2181# This macro should run before the compiler checks (doesn't seem to be
     2182# sufficient for CFLAGS)
     2183
    21812184
    21822185
     
    21872190# - disable debugging (remove -g, set -DNDEBUG)
    21882191# - enable exceptions for (i)cl
    2189 if test "$enable_msvc" = yes ; then
    2190   : ${FFLAGS:=""}
    2191   : ${FCFLAGS:=""}
    2192   : ${CFLAGS:="-DNDEBUG -nologo"}
    2193   : ${CXXFLAGS:="-DNDEBUG -EHsc -nologo"}
    2194   : ${AR:="lib"}
    2195   : ${AR_FLAGS:="-nologo -out:"}
    2196 else
    2197   : ${FFLAGS:=""}
    2198   : ${FCFLAGS:=""}
    2199   : ${CFLAGS:="-DNDEBUG"}
    2200   : ${CXXFLAGS:="-DNDEBUG"}
    2201 fi
     2192
     2193  if test "$enable_msvc" = yes ; then
     2194    : ${FFLAGS:=""}
     2195    : ${FCFLAGS:=""}
     2196    : ${CFLAGS:="-DNDEBUG -nologo"}
     2197    : ${CXXFLAGS:="-DNDEBUG -EHsc -nologo"}
     2198    : ${AR:="lib"}
     2199    : ${AR_FLAGS:="-nologo -out:"}
     2200  else
     2201    : ${FFLAGS:=""}
     2202    : ${FCFLAGS:=""}
     2203    : ${CFLAGS:="-DNDEBUG"}
     2204    : ${CXXFLAGS:="-DNDEBUG"}
     2205  fi
    22022206
    22032207ac_aux_dir=
     
    27262730rmdir .tst 2>/dev/null
    27272731
    2728 # Check whether --enable-silent-rules was given.
    2729 if test "${enable_silent_rules+set}" = set; then :
    2730   enableval=$enable_silent_rules;
    2731 fi
    2732 
    2733 case $enable_silent_rules in # (((
    2734   yes) AM_DEFAULT_VERBOSITY=0;;
    2735    no) AM_DEFAULT_VERBOSITY=1;;
    2736     *) AM_DEFAULT_VERBOSITY=1;;
    2737 esac
    2738 am_make=${MAKE-make}
    2739 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $am_make supports nested variables" >&5
    2740 $as_echo_n "checking whether $am_make supports nested variables... " >&6; }
    2741 if ${am_cv_make_support_nested_variables+:} false; then :
    2742   $as_echo_n "(cached) " >&6
    2743 else
    2744   if $as_echo 'TRUE=$(BAR$(V))
    2745 BAR0=false
    2746 BAR1=true
    2747 V=1
    2748 am__doit:
    2749         @$(TRUE)
    2750 .PHONY: am__doit' | $am_make -f - >/dev/null 2>&1; then
    2751   am_cv_make_support_nested_variables=yes
    2752 else
    2753   am_cv_make_support_nested_variables=no
    2754 fi
    2755 fi
    2756 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_make_support_nested_variables" >&5
    2757 $as_echo "$am_cv_make_support_nested_variables" >&6; }
    2758 if test $am_cv_make_support_nested_variables = yes; then
    2759     AM_V='$(V)'
    2760   AM_DEFAULT_V='$(AM_DEFAULT_VERBOSITY)'
    2761 else
    2762   AM_V=$AM_DEFAULT_VERBOSITY
    2763   AM_DEFAULT_V=$AM_DEFAULT_VERBOSITY
    2764 fi
    2765 AM_BACKSLASH='\'
    2766 
    2767 
    2768 # required autoconf version
     2732
     2733# Enforce the required autoconf version
     2734
    27692735
    27702736
    27712737# Set the project's version numbers
     2738
    27722739
    27732740
     
    27762743_ACEOF
    27772744
     2745
     2746# Parse package version, assuming major.minor.release. PACKAGE_VERSION is set
     2747# by AC_INIT. Force components to 9999 if they're empty; this deals with
     2748# things like `trunk' and other nonstandard forms.
    27782749
    27792750  coin_majorver=`echo $PACKAGE_VERSION | sed -n -e 's/^\([0-9]*\).*/\1/gp'`
     
    27992770
    28002771
    2801   # We use the following variable to have a string with the upper case
    2802   # version of the project name
     2772# Create a variable set to the upper case version of the project name
     2773
    28032774  COIN_PRJCT=GLPK
    28042775
    2805   # Set the project's SVN revision number. The complicated sed expression
    2806   # (made worse by quadrigraphs) ensures that things like 4123:4168MS end up
    2807   # as a single number.
     2776# Set the project's SVN revision number. The complicated sed expression
     2777# (made worse by quadrigraphs) ensures that things like 4123:4168MS end up
     2778# as a single number.
     2779
    28082780  # Extract the first word of "svnversion", so it can be a program name with args.
    28092781set dummy svnversion; ac_word=$2
     
    28592831
    28602832
    2861 # Capture libtool library version, if given.
     2833# Capture the libtool library version, if given.
     2834
    28622835
    28632836
    28642837
    28652838# A useful makefile conditional that is always false
    2866  if false; then
     2839
     2840   if false; then
    28672841  ALWAYS_FALSE_TRUE=
    28682842  ALWAYS_FALSE_FALSE='#'
     
    28732847
    28742848
    2875 # Where should everything be installed by default?  Here, we want it
    2876 # to be installed directly in 'bin', 'lib', 'include' subdirectories
    2877 # of the directory where configure is run.  The default would be
    2878 # /usr/local.
    2879 
    2880 
    2881 # change default compiler flags; this needs to run very early (before AC_CANONICAL_BUILD)
     2849# Where should everything be installed by default?  The COIN default is to
     2850# install directly into subdirectories of the directory where configure is
     2851# run. The default would be to install under /usr/local.
     2852
     2853
     2854
     2855# Change the default compiler flags. This needs to run before
     2856# AC_CANONICAL_BUILD.
     2857
    28822858
    28832859
     
    28862862
    28872863
     2864
    28882865# libtool has some magic for host_os=mingw, but doesn't know about msys
    2889 if test $host_os = msys ; then
    2890   host_os=mingw
    2891   host=`echo $host | sed -e 's/msys/mingw/'`
    2892 fi
    2893 
    2894 # initialize automake
    2895 # - don't define PACKAGE or VERSION
     2866
     2867  if test $host_os = msys ; then
     2868    host_os=mingw
     2869    host=`echo $host | sed -e 's/msys/mingw/'`
     2870  fi
     2871
     2872# Make silent build rules the default (https://www.gnu.org/software/automake/
     2873# manual/html_node/Automake-Silent-Rules.html). Run before AM_INIT_AUTOMAKE,
     2874# which will AC_REQUIRE it anyway.
     2875
     2876  # Check whether --enable-silent-rules was given.
     2877if test "${enable_silent_rules+set}" = set; then :
     2878  enableval=$enable_silent_rules;
     2879fi
     2880
     2881case $enable_silent_rules in # (((
     2882  yes) AM_DEFAULT_VERBOSITY=0;;
     2883   no) AM_DEFAULT_VERBOSITY=1;;
     2884    *) AM_DEFAULT_VERBOSITY=0;;
     2885esac
     2886am_make=${MAKE-make}
     2887{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $am_make supports nested variables" >&5
     2888$as_echo_n "checking whether $am_make supports nested variables... " >&6; }
     2889if ${am_cv_make_support_nested_variables+:} false; then :
     2890  $as_echo_n "(cached) " >&6
     2891else
     2892  if $as_echo 'TRUE=$(BAR$(V))
     2893BAR0=false
     2894BAR1=true
     2895V=1
     2896am__doit:
     2897        @$(TRUE)
     2898.PHONY: am__doit' | $am_make -f - >/dev/null 2>&1; then
     2899  am_cv_make_support_nested_variables=yes
     2900else
     2901  am_cv_make_support_nested_variables=no
     2902fi
     2903fi
     2904{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_make_support_nested_variables" >&5
     2905$as_echo "$am_cv_make_support_nested_variables" >&6; }
     2906if test $am_cv_make_support_nested_variables = yes; then
     2907    AM_V='$(V)'
     2908  AM_DEFAULT_V='$(AM_DEFAULT_VERBOSITY)'
     2909else
     2910  AM_V=$AM_DEFAULT_VERBOSITY
     2911  AM_DEFAULT_V=$AM_DEFAULT_VERBOSITY
     2912fi
     2913AM_BACKSLASH='\'
     2914
     2915
     2916# Initialize automake
     2917# - don't AC_DEFINE PACKAGE or VERSION (but there're still defined as shell
     2918#   variables in configure, and as make variables).
    28962919# - disable dist target
    28972920# - enable all automake warnings
    2898 if test "`cd $srcdir && pwd`" != "`pwd`"; then
     2921
     2922  if test "`cd $srcdir && pwd`" != "`pwd`"; then
    28992923  # Use -I$(srcdir) only when $(srcdir) != ., so that make's output
    29002924  # is not polluted with repeated "-I."
     
    30033027
    30043028
    3005 # make silent build rules the default (https://www.gnu.org/software/automake/manual/html_node/Automake-Silent-Rules.html)
    3006 # Check whether --enable-silent-rules was given.
    3007 if test "${enable_silent_rules+set}" = set; then :
    3008   enableval=$enable_silent_rules;
    3009 fi
    3010 
    3011 case $enable_silent_rules in # (((
    3012   yes) AM_DEFAULT_VERBOSITY=0;;
    3013    no) AM_DEFAULT_VERBOSITY=1;;
    3014     *) AM_DEFAULT_VERBOSITY=0;;
    3015 esac
    3016 am_make=${MAKE-make}
    3017 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $am_make supports nested variables" >&5
    3018 $as_echo_n "checking whether $am_make supports nested variables... " >&6; }
    3019 if ${am_cv_make_support_nested_variables+:} false; then :
    3020   $as_echo_n "(cached) " >&6
    3021 else
    3022   if $as_echo 'TRUE=$(BAR$(V))
    3023 BAR0=false
    3024 BAR1=true
    3025 V=1
    3026 am__doit:
    3027         @$(TRUE)
    3028 .PHONY: am__doit' | $am_make -f - >/dev/null 2>&1; then
    3029   am_cv_make_support_nested_variables=yes
    3030 else
    3031   am_cv_make_support_nested_variables=no
    3032 fi
    3033 fi
    3034 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_make_support_nested_variables" >&5
    3035 $as_echo "$am_cv_make_support_nested_variables" >&6; }
    3036 if test $am_cv_make_support_nested_variables = yes; then
    3037     AM_V='$(V)'
    3038   AM_DEFAULT_V='$(AM_DEFAULT_VERBOSITY)'
    3039 else
    3040   AM_V=$AM_DEFAULT_VERBOSITY
    3041   AM_DEFAULT_V=$AM_DEFAULT_VERBOSITY
    3042 fi
    3043 AM_BACKSLASH='\'
    3044 
    3045 
    3046 # disable automatic rebuild of configure/Makefile
     3029# Disable automatic rebuild of configure/Makefile. Use run_autotools.
     3030
    30473031
    30483032{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable maintainer-specific portions of Makefiles" >&5
     
    31463130
    31473131
    3148 # setting up libtool invokes AC_PROG_CC, but as we may want to change the
    3149 # order of compilers, we want to invoke it from this macro first
    3150 
    3151 
    3152 
    3153 # if enable-msvc, then test only for MS and Intel (on Windows) C compiler
     3132
     3133# Setting up libtool with LT_INIT will AC_REQUIRE AC_PROG_CC, but we want
     3134# to invoke it from this macro first so that we can supply a parameter.
     3135
     3136
     3137
     3138# If enable-msvc, then test only for MS and Intel (on Windows) C compiler
    31543139# otherwise, test a long list of C compilers that comes into our mind
    3155 if test $enable_msvc = yes ; then
    3156   comps="icl cl"
    3157 else
    3158   # TODO old buildtools was doing some $build specific logic here, we still need this?
    3159   comps="gcc clang cc icc icl cl cc xlc xlc_r pgcc"
    3160 fi
    3161 ac_ext=c
     3140
     3141  if test $enable_msvc = yes ; then
     3142    comps="icl cl"
     3143  else
     3144    # TODO old buildtools was doing some $build specific logic here, do we
     3145    # still need this?
     3146    comps="gcc clang cc icc icl cl cc xlc xlc_r pgcc"
     3147  fi
     3148  ac_ext=c
    31623149ac_cpp='$CPP $CPPFLAGS'
    31633150ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
     
    76467633
    76477634
    7648 # setup libtool parameters (https://www.gnu.org/software/libtool/manual/html_node/LT_005fINIT.html)
    7649 
    7650 case $host_os in
    7651   cygwin* | mingw* | msys* )
    7652     # on Windows, shared C++ libraries do not work with current libtool (handles only exports for C functions, not C++)
    7653     # Check whether --enable-shared was given.
     7635# On Windows, shared C++ libraries do not work with the current libtool (it
     7636# handles only exports for C functions, not C++). On all other systems, build
     7637# only shared libraries.
     7638
     7639# (lh, 180302) Sadly, we can't use the obvious libtool macros
     7640# (AC_{ENABLE,DISABLE}_{SHARED,STATIC}, nor parameters to LT_INIT,
     7641# precisely because these macros record the default behaviour by defining
     7642# a macro, _LT_ENABLE_{SHARED,STATIC}_DEFAULT. No shell code involved, hence
     7643# any shell conditional has no effect. Either we trust libtool or we need
     7644# something more inventive. The relevant libtool macros are in ltoptions.m4,
     7645# _LT_ENABLE_SHARED and _LT_ENABLE_STATIC.
     7646
     7647# case $host_os in
     7648#   cygwin* | mingw* | msys* )
     7649#     AC_DISABLE_SHARED
     7650#     ;;
     7651#   *)
     7652#     AC_DISABLE_STATIC
     7653#     ;;
     7654# esac
     7655
     7656# Create libtool.
     7657
     7658
     7659
     7660
     7661
     7662# Set options
     7663
     7664
     7665
     7666        enable_dlopen=no
     7667
     7668
     7669  enable_win32_dll=no
     7670
     7671
     7672            # Check whether --enable-shared was given.
    76547673if test "${enable_shared+set}" = set; then :
    76557674  enableval=$enable_shared; p=${PACKAGE-default}
     
    76717690    esac
    76727691else
    7673   enable_shared=no
    7674 fi
    7675 
    7676 
    7677 
    7678 
    7679 
    7680 
    7681 
    7682 
    7683 
    7684         ;;
    7685   *)
    7686     # Check whether --enable-static was given.
     7692  enable_shared=yes
     7693fi
     7694
     7695
     7696
     7697
     7698
     7699
     7700
     7701
     7702
     7703  # Check whether --enable-static was given.
    76877704if test "${enable_static+set}" = set; then :
    76887705  enableval=$enable_static; p=${PACKAGE-default}
     
    77047721    esac
    77057722else
    7706   enable_static=no
    7707 fi
    7708 
    7709 
    7710 
    7711 
    7712 
    7713 
    7714 
    7715 
    7716 
    7717         ;;
    7718 esac
    7719 
    7720 # create libtool
    7721 
    7722 
    7723 
    7724 
    7725 # Set options
    7726 
    7727 
    7728 
    7729         enable_dlopen=no
    7730 
    7731 
    7732   enable_win32_dll=no
     7723  enable_static=yes
     7724fi
     7725
     7726
     7727
     7728
     7729
    77337730
    77347731
     
    81678164
    81688165
    8169 ## CAVEAT EMPTOR:
    8170 ## There is no encapsulation within the following macros, do not change
    8171 ## the running order or otherwise move them around unless you know exactly
    8172 ## what you are doing...
    81738166if test -n "$compiler"; then
    81748167
     
    1196011953
    1196111954
    11962 # setup patch-up for libtool (need to be run after config.status created libtool)
    11963 case "$AR" in
    11964   *lib* | *LIB* )
    11965      ac_config_commands="$ac_config_commands libtoolpatch"
    11966 
    11967          ;;
    11968 esac
    11969 
    11970 # -no-undefined is required for DLLs on Windows
    11971 LT_LDFLAGS="-no-undefined"
    11972 
     11955# Patch libtool to eliminate a trailing space after AR_FLAGS. This needs to be
     11956# run after config.status has created libtool. Apparently necessary on
     11957# Windows when lib.exe is the archive tool.
     11958
     11959  case "$AR" in
     11960    *lib* | *LIB* )
     11961      ac_config_commands="$ac_config_commands libtoolpatch"
     11962
     11963      ;;
     11964  esac
     11965
     11966# Set up LT_LDFLAGS. Add the library version string to LT_LDFLAGS, if one
     11967# is supplied.
     11968
     11969
     11970  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if the library version is set" >&5
     11971$as_echo_n "checking if the library version is set... " >&6; }
     11972  if test x"$coin_libversion" != x ; then
     11973    LT_LDFLAGS="$LT_LDFLAGS -version-info $coin_libversion"
     11974    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $coin_libversion" >&5
     11975$as_echo "$coin_libversion" >&6; }
     11976  else
     11977    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
     11978$as_echo "no" >&6; }
     11979  fi
     11980
     11981  #TODO we should be able to add this flag
     11982  #LT_LDFLAGS="$LT_LDFLAGS -no-undefined"
    1197311983
    1197411984
     
    1200112011
    1200212012
    12003 cat >confcache <<\_ACEOF
     12013  cat >confcache <<\_ACEOF
    1200412014# This file is a shell script that caches the results of configure
    1200512015# tests run on this system so they can be shared between configure
     
    1273512745double_quote_subst='$double_quote_subst'
    1273612746delay_variable_subst='$delay_variable_subst'
     12747macro_version='`$ECHO "$macro_version" | $SED "$delay_single_quote_subst"`'
     12748macro_revision='`$ECHO "$macro_revision" | $SED "$delay_single_quote_subst"`'
    1273712749enable_shared='`$ECHO "$enable_shared" | $SED "$delay_single_quote_subst"`'
    1273812750enable_static='`$ECHO "$enable_static" | $SED "$delay_single_quote_subst"`'
    12739 macro_version='`$ECHO "$macro_version" | $SED "$delay_single_quote_subst"`'
    12740 macro_revision='`$ECHO "$macro_revision" | $SED "$delay_single_quote_subst"`'
    1274112751pic_mode='`$ECHO "$pic_mode" | $SED "$delay_single_quote_subst"`'
    1274212752enable_fast_install='`$ECHO "$enable_fast_install" | $SED "$delay_single_quote_subst"`'
     
    1376413774# ### BEGIN LIBTOOL CONFIG
    1376513775
    13766 # Whether or not to build shared libraries.
    13767 build_libtool_libs=$enable_shared
    13768 
    13769 # Whether or not to build static libraries.
    13770 build_old_libs=$enable_static
    13771 
    1377213776# Which release of libtool.m4 was used?
    1377313777macro_version=$macro_version
    1377413778macro_revision=$macro_revision
     13779
     13780# Whether or not to build shared libraries.
     13781build_libtool_libs=$enable_shared
     13782
     13783# Whether or not to build static libraries.
     13784build_old_libs=$enable_static
    1377513785
    1377613786# What type of objects to build.
     
    1425514265
    1425614266 ;;
    14257     "libtoolpatch":C)
    14258        # eliminate space after AR_FLAGS
    14259        sed -e 's|AR_FLAGS |AR_FLAGS|g' libtool > libtool.tmp
    14260        mv libtool.tmp libtool
    14261        chmod 755 libtool
    14262           ;;
     14267    "libtoolpatch":C) sed -e 's|AR_FLAGS |AR_FLAGS|g' libtool > libtool.tmp
     14268         mv libtool.tmp libtool
     14269         chmod 755 libtool ;;
    1426314270
    1426414271  esac
     
    1444514452
    1444614453
    14447 { $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
     14454  { $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
    1444814455$as_echo "$as_me: In case of trouble, first consult the troubleshooting page at https://projects.coin-or.org/BuildTools/wiki/user-troubleshooting" >&6;}
    14449 { $as_echo "$as_me:${as_lineno-$LINENO}: Configuration of $PACKAGE_NAME successful" >&5
     14456  { $as_echo "$as_me:${as_lineno-$LINENO}: Configuration of $PACKAGE_NAME successful" >&5
    1445014457$as_echo "$as_me: Configuration of $PACKAGE_NAME successful" >&6;}
    1445114458
Note: See TracChangeset for help on using the changeset viewer.