Changeset 3685


Ignore:
Timestamp:
Sep 21, 2016 9:04:30 AM (3 years ago)
Author:
stefan
Message:

rerun autotools

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

Legend:

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

    r3677 r3685  
    335335LN_S = @LN_S@
    336336LTLIBOBJS = @LTLIBOBJS@
     337LT_LDFLAGS = @LT_LDFLAGS@
    337338LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
    338339MAINT = @MAINT@
  • ThirdParty/Glpk/branches/autotools-update/configure

    r3682 r3685  
    648648glpkminorver
    649649glpkmajorver
     650LT_LDFLAGS
    650651CPP
    651652LT_SYS_LIBRARY_PATH
     
    670671GREP
    671672SED
    672 host_os
    673 host_vendor
    674 host_cpu
    675 host
    676673LIBTOOL
    677674am__fastdepCC_FALSE
     
    722719INSTALL_SCRIPT
    723720INSTALL_PROGRAM
     721host_os
     722host_vendor
     723host_cpu
     724host
    724725build_os
    725726build_vendor
     
    775776enable_maintainer_mode
    776777enable_dependency_tracking
     778enable_shared
    777779enable_static
    778 enable_shared
    779780with_pic
    780781enable_fast_install
     
    14261427  --disable-dependency-tracking
    14271428                          speeds up one-time build
     1429  --enable-shared[=PKGS]  build shared libraries [default=no]
    14281430  --enable-static[=PKGS]  build static libraries [default=no]
    1429   --enable-shared[=PKGS]  build shared libraries [default=yes]
    14301431  --enable-fast-install[=PKGS]
    14311432                          optimize for fast installation [default=yes]
     
    23592360
    23602361
     2362{ $as_echo "$as_me:${as_lineno-$LINENO}: checking host system type" >&5
     2363$as_echo_n "checking host system type... " >&6; }
     2364if ${ac_cv_host+:} false; then :
     2365  $as_echo_n "(cached) " >&6
     2366else
     2367  if test "x$host_alias" = x; then
     2368  ac_cv_host=$ac_cv_build
     2369else
     2370  ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` ||
     2371    as_fn_error $? "$SHELL $ac_aux_dir/config.sub $host_alias failed" "$LINENO" 5
     2372fi
     2373
     2374fi
     2375{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_host" >&5
     2376$as_echo "$ac_cv_host" >&6; }
     2377case $ac_cv_host in
     2378*-*-*) ;;
     2379*) as_fn_error $? "invalid value of canonical host" "$LINENO" 5;;
     2380esac
     2381host=$ac_cv_host
     2382ac_save_IFS=$IFS; IFS='-'
     2383set x $ac_cv_host
     2384shift
     2385host_cpu=$1
     2386host_vendor=$2
     2387shift; shift
     2388# Remember, the first character of IFS is used to create $*,
     2389# except with old shells:
     2390host_os=$*
     2391IFS=$ac_save_IFS
     2392case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac
     2393
     2394
    23612395am__api_version='1.15'
    23622396
     
    29402974
    29412975
    2942 # Get the system type
    2943 
     2976# Get the build and host types
     2977
     2978
     2979
     2980# libtool has some magic for host_os=mingw, but doesn't know about msys
     2981if test $host_os = msys ; then
     2982  host_os=mingw
     2983  host=`echo $host | sed -e 's/msys/mingw/'`
     2984fi
    29442985
    29452986# initialize automake
     
    40154056
    40164057ltmain=$ac_aux_dir/ltmain.sh
    4017 
    4018 { $as_echo "$as_me:${as_lineno-$LINENO}: checking host system type" >&5
    4019 $as_echo_n "checking host system type... " >&6; }
    4020 if ${ac_cv_host+:} false; then :
    4021   $as_echo_n "(cached) " >&6
    4022 else
    4023   if test "x$host_alias" = x; then
    4024   ac_cv_host=$ac_cv_build
    4025 else
    4026   ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` ||
    4027     as_fn_error $? "$SHELL $ac_aux_dir/config.sub $host_alias failed" "$LINENO" 5
    4028 fi
    4029 
    4030 fi
    4031 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_host" >&5
    4032 $as_echo "$ac_cv_host" >&6; }
    4033 case $ac_cv_host in
    4034 *-*-*) ;;
    4035 *) as_fn_error $? "invalid value of canonical host" "$LINENO" 5;;
    4036 esac
    4037 host=$ac_cv_host
    4038 ac_save_IFS=$IFS; IFS='-'
    4039 set x $ac_cv_host
    4040 shift
    4041 host_cpu=$1
    4042 host_vendor=$2
    4043 shift; shift
    4044 # Remember, the first character of IFS is used to create $*,
    4045 # except with old shells:
    4046 host_os=$*
    4047 IFS=$ac_save_IFS
    4048 case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac
    4049 
    40504058
    40514059# Backslashify metacharacters that are still active within
     
    77257733# setup libtool parameters (https://www.gnu.org/software/libtool/manual/html_node/LT_005fINIT.html)
    77267734
    7727 
    7728 
    7729 
    7730 # Set options
    7731 # Check whether --enable-static was given.
     7735case $host_os in
     7736  cygwin* | mingw* | msys* )
     7737    # on Windows, shared C++ libraries do not work with current libtool (handles only exports for C functions, not C++)
     7738    # Check whether --enable-shared was given.
     7739if test "${enable_shared+set}" = set; then :
     7740  enableval=$enable_shared; p=${PACKAGE-default}
     7741    case $enableval in
     7742    yes) enable_shared=yes ;;
     7743    no) enable_shared=no ;;
     7744    *)
     7745      enable_shared=no
     7746      # Look at the argument we got.  We use all the common list separators.
     7747      lt_save_ifs=$IFS; IFS=$IFS$PATH_SEPARATOR,
     7748      for pkg in $enableval; do
     7749        IFS=$lt_save_ifs
     7750        if test "X$pkg" = "X$p"; then
     7751          enable_shared=yes
     7752        fi
     7753      done
     7754      IFS=$lt_save_ifs
     7755      ;;
     7756    esac
     7757else
     7758  enable_shared=no
     7759fi
     7760
     7761
     7762
     7763
     7764
     7765
     7766
     7767
     7768
     7769        ;;
     7770  *)
     7771    # Check whether --enable-static was given.
    77327772if test "${enable_static+set}" = set; then :
    77337773  enableval=$enable_static; p=${PACKAGE-default}
     
    77607800
    77617801
     7802        ;;
     7803esac
     7804
     7805# create libtool
     7806
     7807
     7808
     7809
     7810# Set options
     7811
     7812
    77627813
    77637814        enable_dlopen=no
     
    77657816
    77667817  enable_win32_dll=no
    7767 
    7768 
    7769             # Check whether --enable-shared was given.
    7770 if test "${enable_shared+set}" = set; then :
    7771   enableval=$enable_shared; p=${PACKAGE-default}
    7772     case $enableval in
    7773     yes) enable_shared=yes ;;
    7774     no) enable_shared=no ;;
    7775     *)
    7776       enable_shared=no
    7777       # Look at the argument we got.  We use all the common list separators.
    7778       lt_save_ifs=$IFS; IFS=$IFS$PATH_SEPARATOR,
    7779       for pkg in $enableval; do
    7780         IFS=$lt_save_ifs
    7781         if test "X$pkg" = "X$p"; then
    7782           enable_shared=yes
    7783         fi
    7784       done
    7785       IFS=$lt_save_ifs
    7786       ;;
    7787     esac
    7788 else
    7789   enable_shared=yes
    7790 fi
    7791 
    7792 
    7793 
    7794 
    7795 
    7796 
    77977818
    77987819
     
    1202412045
    1202512046
    12026 # create libtool
    12027 
    12028 
    1202912047# setup patch-up for libtool (need to be run after config.status created libtool)
    1203012048case "$AR" in
     
    1203412052         ;;
    1203512053esac
     12054
     12055# -no-undefined is required for DLLs on Windows
     12056LT_LDFLAGS="-no-undefined"
    1203612057
    1203712058
     
    1321713238double_quote_subst='$double_quote_subst'
    1321813239delay_variable_subst='$delay_variable_subst'
     13240enable_shared='`$ECHO "$enable_shared" | $SED "$delay_single_quote_subst"`'
     13241enable_static='`$ECHO "$enable_static" | $SED "$delay_single_quote_subst"`'
    1321913242macro_version='`$ECHO "$macro_version" | $SED "$delay_single_quote_subst"`'
    1322013243macro_revision='`$ECHO "$macro_revision" | $SED "$delay_single_quote_subst"`'
    13221 enable_static='`$ECHO "$enable_static" | $SED "$delay_single_quote_subst"`'
    13222 enable_shared='`$ECHO "$enable_shared" | $SED "$delay_single_quote_subst"`'
    1322313244pic_mode='`$ECHO "$pic_mode" | $SED "$delay_single_quote_subst"`'
    1322413245enable_fast_install='`$ECHO "$enable_fast_install" | $SED "$delay_single_quote_subst"`'
     
    1424614267# ### BEGIN LIBTOOL CONFIG
    1424714268
     14269# Whether or not to build shared libraries.
     14270build_libtool_libs=$enable_shared
     14271
     14272# Whether or not to build static libraries.
     14273build_old_libs=$enable_static
     14274
    1424814275# Which release of libtool.m4 was used?
    1424914276macro_version=$macro_version
    1425014277macro_revision=$macro_revision
    14251 
    14252 # Whether or not to build static libraries.
    14253 build_old_libs=$enable_static
    14254 
    14255 # Whether or not to build shared libraries.
    14256 build_libtool_libs=$enable_shared
    1425714278
    1425814279# What type of objects to build.
Note: See TracChangeset for help on using the changeset viewer.