Changeset 4071 for ThirdParty/Glpk/trunk


Ignore:
Timestamp:
Jan 21, 2020 9:40:19 AM (5 months ago)
Author:
stefan
Message:

run captureConfigFiles

Location:
ThirdParty/Glpk/trunk/glpk_config_files
Files:
5 edited

Legend:

Unmodified
Added
Removed
  • ThirdParty/Glpk/trunk/glpk_config_files/Makefile.in

    r4056 r4071  
    158158DIST_SUBDIRS = $(SUBDIRS)
    159159ACLOCAL = @ACLOCAL@
     160ADD_CFLAGS = @ADD_CFLAGS@
    160161AMTAR = @AMTAR@
    161162AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
  • ThirdParty/Glpk/trunk/glpk_config_files/aclocal.m4

    r4056 r4071  
    12821282
    12831283  AC_ARG_ENABLE([debug],
    1284     [AC_HELP_STRING([--enable-debug],
    1285        [build debugging symbols and turn off compiler optimization])],
     1284    [AC_HELP_STRING([--enable-debug],[build debugging symbols and turn off compiler optimization])],
    12861285    [enable_debug=$enableval],
    12871286    [enable_debug=no])
     
    13021301  if test "$enable_debug" = yes ; then
    13031302    if test "$enable_msvc" = yes ; then
    1304       : ${FFLAGS:="-nologo -fpp -Z7 -MDd"}
    1305       : ${FCFLAGS:="-nologo -fpp -Z7 -MDd"}
    1306       : ${CFLAGS:="-nologo -Z7 -MDd"}
    1307       : ${CXXFLAGS:="-nologo -EHs -Z7 -MDd"}
     1303      : ${FFLAGS:="-nologo -fpp -Z7 -MDd $ADD_FFLAGS"}
     1304      : ${FCFLAGS:="-nologo -fpp -Z7 -MDd $ADD_FCFLAGS"}
     1305      : ${CFLAGS:="-nologo -Z7 -MDd $ADD_CFLAGS"}
     1306      : ${CXXFLAGS:="-nologo -EHs -Z7 -MDd $ADD_CXXFLAGS"}
    13081307      : ${AR:="lib"}
    13091308      : ${AR_FLAGS:="-nologo -out:"}
    13101309    else
    1311       : ${FFLAGS:="-g"}
    1312       : ${FCFLAGS:="-g"}
    1313       : ${CFLAGS:="-g"}
    1314       : ${CXXFLAGS:="-g"}
     1310      : ${FFLAGS:="-g $ADD_FFLAGS"}
     1311      : ${FCFLAGS:="-g $ADD_FCFLAGS"}
     1312      : ${CFLAGS:="-g $ADD_CFLAGS"}
     1313      : ${CXXFLAGS:="-g $ADD_CXXFLAGS"}
    13151314    fi
    13161315  else
    13171316    if test "$enable_msvc" = yes ; then
    1318       : ${FFLAGS:="-nologo -fpp -O2 -MD"}
    1319       : ${FCFLAGS:="-nologo -fpp -O2 -MD"}
    1320       : ${CFLAGS:="-nologo -DNDEBUG -O2 -MD"}
    1321       : ${CXXFLAGS:="-nologo -EHs -DNDEBUG -O2 -MD"}
     1317      : ${FFLAGS:="-nologo -fpp -O2 -MD $ADD_FFLAGS"}
     1318      : ${FCFLAGS:="-nologo -fpp -O2 -MD $ADD_FCFLAGS"}
     1319      : ${CFLAGS:="-nologo -DNDEBUG -O2 -MD $ADD_CFLAGS"}
     1320      : ${CXXFLAGS:="-nologo -EHs -DNDEBUG -O2 -MD $ADD_CXXFLAGS"}
    13221321      : ${AR:="lib"}
    13231322      : ${AR_FLAGS:="-nologo -out:"}
    13241323    else
    1325       : ${FFLAGS:="-O2"}
    1326       : ${FCFLAGS:="-O2"}
    1327       : ${CFLAGS:="-O2 -DNDEBUG"}
    1328       : ${CXXFLAGS:="-O2 -DNDEBUG"}
     1324      : ${FFLAGS:="-O2 $ADD_FFLAGS"}
     1325      : ${FCFLAGS:="-O2 $ADD_FCFLAGS"}
     1326      : ${CFLAGS:="-O2 -DNDEBUG $ADD_CFLAGS"}
     1327      : ${CXXFLAGS:="-O2 -DNDEBUG $ADD_CXXFLAGS"}
    13291328    fi
    13301329  fi
     
    14451444  prefix=$save_prefix
    14461445  exec_prefix=$save_exec_prefix
     1446
     1447# add a configure flag to indicate whether .pc files should be made relocatable
     1448# off by default, as it creates libtool warnings
     1449  AC_ARG_ENABLE([relocatable],
     1450    [AC_HELP_STRING([--enable-relocatable],
     1451       [whether prefix in installed .pc files should be setup relative to pcfiledir])],
     1452    [coin_enable_relocatable=$enableval],
     1453    [coin_enable_relocatable=no])
     1454  AM_CONDITIONAL([COIN_RELOCATABLE], [test $coin_enable_relocatable = yes])
    14471455])
    14481456
     
    15751583
    15761584  AC_PROG_CC([gcc clang cc icc icl cl cc xlc xlc_r pgcc])
     1585
     1586  # Declare precious variable for additional compiler flags
     1587  AC_ARG_VAR(ADD_CFLAGS,[Additional C compiler options (if not overwriting CFLAGS)])
    15771588])
    15781589
     
    16161627    CXX="$am_aux_dir/compile $CXX"
    16171628  fi
     1629
     1630  # Declare precious variable for additional compiler flags
     1631  AC_ARG_VAR(ADD_CXXFLAGS,[Additional C++ compiler options (if not overwriting CXXFLAGS)])
    16181632])
    16191633
  • ThirdParty/Glpk/trunk/glpk_config_files/configure

    r4056 r4071  
    663663DLLTOOL
    664664AS
     665ADD_CFLAGS
    665666am__fastdepCC_FALSE
    666667am__fastdepCC_TRUE
     
    678679LDFLAGS
    679680CFLAGS
     681COIN_RELOCATABLE_FALSE
     682COIN_RELOCATABLE_TRUE
    680683MAINT
    681684MAINTAINER_MODE_FALSE
     
    765768enable_silent_rules
    766769enable_maintainer_mode
     770enable_relocatable
    767771enable_dependency_tracking
    768772enable_static
     
    788792LIBS
    789793CPPFLAGS
     794ADD_CFLAGS
    790795LT_SYS_LIBRARY_PATH
    791796CPP'
     
    14171422                          enable make rules and dependencies not useful (and
    14181423                          sometimes confusing) to the casual installer
     1424  --enable-relocatable    whether prefix in installed .pc files should be
     1425                          setup relative to pcfiledir
    14191426  --enable-dependency-tracking
    14201427                          do not reject slow dependency extractors
     
    14521459  CPPFLAGS    (Objective) C/C++ preprocessor flags, e.g. -I<include dir> if
    14531460              you have headers in a nonstandard directory <include dir>
     1461  ADD_CFLAGS  Additional C compiler options (if not overwriting CFLAGS)
    14541462  LT_SYS_LIBRARY_PATH
    14551463              User-defined run-time library search path.
     
    23962404  if test "$enable_debug" = yes ; then
    23972405    if test "$enable_msvc" = yes ; then
    2398       : ${FFLAGS:="-nologo -fpp -Z7 -MDd"}
    2399       : ${FCFLAGS:="-nologo -fpp -Z7 -MDd"}
    2400       : ${CFLAGS:="-nologo -Z7 -MDd"}
    2401       : ${CXXFLAGS:="-nologo -EHs -Z7 -MDd"}
     2406      : ${FFLAGS:="-nologo -fpp -Z7 -MDd $ADD_FFLAGS"}
     2407      : ${FCFLAGS:="-nologo -fpp -Z7 -MDd $ADD_FCFLAGS"}
     2408      : ${CFLAGS:="-nologo -Z7 -MDd $ADD_CFLAGS"}
     2409      : ${CXXFLAGS:="-nologo -EHs -Z7 -MDd $ADD_CXXFLAGS"}
    24022410      : ${AR:="lib"}
    24032411      : ${AR_FLAGS:="-nologo -out:"}
    24042412    else
    2405       : ${FFLAGS:="-g"}
    2406       : ${FCFLAGS:="-g"}
    2407       : ${CFLAGS:="-g"}
    2408       : ${CXXFLAGS:="-g"}
     2413      : ${FFLAGS:="-g $ADD_FFLAGS"}
     2414      : ${FCFLAGS:="-g $ADD_FCFLAGS"}
     2415      : ${CFLAGS:="-g $ADD_CFLAGS"}
     2416      : ${CXXFLAGS:="-g $ADD_CXXFLAGS"}
    24092417    fi
    24102418  else
    24112419    if test "$enable_msvc" = yes ; then
    2412       : ${FFLAGS:="-nologo -fpp -O2 -MD"}
    2413       : ${FCFLAGS:="-nologo -fpp -O2 -MD"}
    2414       : ${CFLAGS:="-nologo -DNDEBUG -O2 -MD"}
    2415       : ${CXXFLAGS:="-nologo -EHs -DNDEBUG -O2 -MD"}
     2420      : ${FFLAGS:="-nologo -fpp -O2 -MD $ADD_FFLAGS"}
     2421      : ${FCFLAGS:="-nologo -fpp -O2 -MD $ADD_FCFLAGS"}
     2422      : ${CFLAGS:="-nologo -DNDEBUG -O2 -MD $ADD_CFLAGS"}
     2423      : ${CXXFLAGS:="-nologo -EHs -DNDEBUG -O2 -MD $ADD_CXXFLAGS"}
    24162424      : ${AR:="lib"}
    24172425      : ${AR_FLAGS:="-nologo -out:"}
    24182426    else
    2419       : ${FFLAGS:="-O2"}
    2420       : ${FCFLAGS:="-O2"}
    2421       : ${CFLAGS:="-O2 -DNDEBUG"}
    2422       : ${CXXFLAGS:="-O2 -DNDEBUG"}
     2427      : ${FFLAGS:="-O2 $ADD_FFLAGS"}
     2428      : ${FCFLAGS:="-O2 $ADD_FCFLAGS"}
     2429      : ${CFLAGS:="-O2 -DNDEBUG $ADD_CFLAGS"}
     2430      : ${CXXFLAGS:="-O2 -DNDEBUG $ADD_CXXFLAGS"}
    24232431    fi
    24242432  fi
     
    31593167  prefix=$save_prefix
    31603168  exec_prefix=$save_exec_prefix
     3169
     3170# add a configure flag to indicate whether .pc files should be made relocatable
     3171# off by default, as it creates libtool warnings
     3172  # Check whether --enable-relocatable was given.
     3173if test "${enable_relocatable+set}" = set; then :
     3174  enableval=$enable_relocatable; coin_enable_relocatable=$enableval
     3175else
     3176  coin_enable_relocatable=no
     3177fi
     3178
     3179   if test $coin_enable_relocatable = yes; then
     3180  COIN_RELOCATABLE_TRUE=
     3181  COIN_RELOCATABLE_FALSE='#'
     3182else
     3183  COIN_RELOCATABLE_TRUE='#'
     3184  COIN_RELOCATABLE_FALSE=
     3185fi
     3186
    31613187
    31623188
     
    40884114fi
    40894115
     4116
     4117
     4118  # Declare precious variable for additional compiler flags
    40904119
    40914120
     
    1286512894if test -z "${MAINTAINER_MODE_TRUE}" && test -z "${MAINTAINER_MODE_FALSE}"; then
    1286612895  as_fn_error $? "conditional \"MAINTAINER_MODE\" was never defined.
     12896Usually this means the macro was only invoked conditionally." "$LINENO" 5
     12897fi
     12898if test -z "${COIN_RELOCATABLE_TRUE}" && test -z "${COIN_RELOCATABLE_FALSE}"; then
     12899  as_fn_error $? "conditional \"COIN_RELOCATABLE\" was never defined.
    1286712900Usually this means the macro was only invoked conditionally." "$LINENO" 5
    1286812901fi
  • ThirdParty/Glpk/trunk/glpk_config_files/examples/Makefile.in

    r4056 r4071  
    171171CTAGS = ctags
    172172ACLOCAL = @ACLOCAL@
     173ADD_CFLAGS = @ADD_CFLAGS@
    173174AMTAR = @AMTAR@
    174175AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
  • ThirdParty/Glpk/trunk/glpk_config_files/src/Makefile.in

    r4056 r4071  
    506506CTAGS = ctags
    507507ACLOCAL = @ACLOCAL@
     508ADD_CFLAGS = @ADD_CFLAGS@
    508509AMTAR = @AMTAR@
    509510AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
Note: See TracChangeset for help on using the changeset viewer.