Changeset 3666 for ThirdParty/Glpk


Ignore:
Timestamp:
Sep 6, 2016 10:31:26 AM (3 years 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.am

    r3250 r3666  
    141141@GLPKDIR@/src/zlib/zutil.c
    142142
    143 DEFAULT_INCLUDES = -I. -I`$(CYGPATH_W) $(srcdir)`
    144 
    145143AM_CPPFLAGS = \
    146144  -I`$(CYGPATH_W) $(srcdir)/@GLPKDIR@/src` \
  • ThirdParty/Glpk/branches/autotools-update/Makefile.in

    r3659 r3666  
    241241am__v_at_0 = @
    242242am__v_at_1 =
     243DEFAULT_INCLUDES = -I.@am__isrc@
    243244depcomp = $(SHELL) $(top_srcdir)/depcomp
    244245am__depfiles_maybe = depfiles
     
    547548@GLPKDIR@/src/zlib/zutil.c
    548549
    549 DEFAULT_INCLUDES = -I. -I`$(CYGPATH_W) $(srcdir)`
    550550AM_CPPFLAGS = \
    551551  -I`$(CYGPATH_W) $(srcdir)/@GLPKDIR@/src` \
  • ThirdParty/Glpk/branches/autotools-update/configure

    r3662 r3666  
    773773enable_silent_rules
    774774enable_maintainer_mode
     775enable_static
    775776enable_shared
    776 enable_static
    777777with_pic
    778778enable_fast_install
     
    14191419                          enable make rules and dependencies not useful (and
    14201420                          sometimes confusing) to the casual installer
     1421  --enable-static[=PKGS]  build static libraries [default=no]
    14211422  --enable-shared[=PKGS]  build shared libraries [default=yes]
    1422   --enable-static[=PKGS]  build static libraries [default=yes]
    14231423  --enable-fast-install[=PKGS]
    14241424                          optimize for fast installation [default=yes]
     
    76747674# - don't define PACKAGE or VERSION
    76757675# - disable dist target
    7676 # - enable more automake warnings (all except override)
     7676# - enable all automake warnings
    76777677if test "`cd $srcdir && pwd`" != "`pwd`"; then
    76787678  # Use -I$(srcdir) only when $(srcdir) != ., so that make's output
     
    78487848
    78497849
    7850 # create libtool
     7850# setup libtool parameters (https://www.gnu.org/software/libtool/manual/html_node/LT_005fINIT.html)
    78517851
    78527852
     
    78547854
    78557855# Set options
     7856# Check whether --enable-static was given.
     7857if test "${enable_static+set}" = set; then :
     7858  enableval=$enable_static; p=${PACKAGE-default}
     7859    case $enableval in
     7860    yes) enable_static=yes ;;
     7861    no) enable_static=no ;;
     7862    *)
     7863     enable_static=no
     7864      # Look at the argument we got.  We use all the common list separators.
     7865      lt_save_ifs=$IFS; IFS=$IFS$PATH_SEPARATOR,
     7866      for pkg in $enableval; do
     7867        IFS=$lt_save_ifs
     7868        if test "X$pkg" = "X$p"; then
     7869          enable_static=yes
     7870        fi
     7871      done
     7872      IFS=$lt_save_ifs
     7873      ;;
     7874    esac
     7875else
     7876  enable_static=no
     7877fi
     7878
     7879
     7880
     7881
     7882
     7883
     7884
    78567885
    78577886
     
    78867915fi
    78877916
    7888 
    7889 
    7890 
    7891 
    7892 
    7893 
    7894 
    7895 
    7896   # Check whether --enable-static was given.
    7897 if test "${enable_static+set}" = set; then :
    7898   enableval=$enable_static; p=${PACKAGE-default}
    7899     case $enableval in
    7900     yes) enable_static=yes ;;
    7901     no) enable_static=no ;;
    7902     *)
    7903      enable_static=no
    7904       # Look at the argument we got.  We use all the common list separators.
    7905       lt_save_ifs=$IFS; IFS=$IFS$PATH_SEPARATOR,
    7906       for pkg in $enableval; do
    7907         IFS=$lt_save_ifs
    7908         if test "X$pkg" = "X$p"; then
    7909           enable_static=yes
    7910         fi
    7911       done
    7912       IFS=$lt_save_ifs
    7913       ;;
    7914     esac
    7915 else
    7916   enable_static=yes
    7917 fi
    79187917
    79197918
     
    1215012149
    1215112150
     12151# create libtool
     12152
     12153
     12154# change default compiler flags (should we have an enable-debug again?)
     12155# - some compilers doesn't understand -g
     12156# - set -DNDEBUG for C/C++ code
     12157: ${FFLAGS:=""}
     12158: ${FCFLAGS:=""}
     12159: ${CFLAGS:="-DNDEBUG"}
     12160: ${CXXFLAGS:="-DNDEBUG"}
     12161
    1215212162
    1215312163#############################################################################
     
    1406914079macro_version='`$ECHO "$macro_version" | $SED "$delay_single_quote_subst"`'
    1407014080macro_revision='`$ECHO "$macro_revision" | $SED "$delay_single_quote_subst"`'
     14081enable_static='`$ECHO "$enable_static" | $SED "$delay_single_quote_subst"`'
    1407114082enable_shared='`$ECHO "$enable_shared" | $SED "$delay_single_quote_subst"`'
    14072 enable_static='`$ECHO "$enable_static" | $SED "$delay_single_quote_subst"`'
    1407314083pic_mode='`$ECHO "$pic_mode" | $SED "$delay_single_quote_subst"`'
    1407414084enable_fast_install='`$ECHO "$enable_fast_install" | $SED "$delay_single_quote_subst"`'
     
    1509915109macro_revision=$macro_revision
    1510015110
     15111# Whether or not to build static libraries.
     15112build_old_libs=$enable_static
     15113
    1510115114# Whether or not to build shared libraries.
    1510215115build_libtool_libs=$enable_shared
    15103 
    15104 # Whether or not to build static libraries.
    15105 build_old_libs=$enable_static
    1510615116
    1510715117# What type of objects to build.
Note: See TracChangeset for help on using the changeset viewer.