Changeset 4114


Ignore:
Timestamp:
Jan 31, 2020 9:49:06 AM (2 months ago)
Author:
stefan
Message:

sync with trunk

Location:
ThirdParty/Metis/stable/2.0
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • ThirdParty/Metis/stable/2.0

  • ThirdParty/Metis/stable/2.0/Makefile.in

    r4024 r4114  
    313313pkgincludedir = $(includedir)/coin-or
    314314ACLOCAL = @ACLOCAL@
     315ADD_CFLAGS = @ADD_CFLAGS@
    315316AMTAR = @AMTAR@
    316317AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
  • ThirdParty/Metis/stable/2.0/coinmetis.pc.in

    r4024 r4114  
    1 prefix=@prefix@
     1@COIN_RELOCATABLE_FALSE@prefix=@prefix@
     2@COIN_RELOCATABLE_TRUE@prefix=${pcfiledir}/../..
    23exec_prefix=@exec_prefix@
    34libdir=@libdir@
  • ThirdParty/Metis/stable/2.0/configure

    r4042 r4114  
    674674SED
    675675LIBTOOL
     676ADD_CFLAGS
    676677am__fastdepCC_FALSE
    677678am__fastdepCC_TRUE
     
    689690LDFLAGS
    690691CFLAGS
     692COIN_RELOCATABLE_FALSE
     693COIN_RELOCATABLE_TRUE
    691694MAINT
    692695MAINTAINER_MODE_FALSE
     
    776779enable_silent_rules
    777780enable_maintainer_mode
     781enable_relocatable
    778782enable_dependency_tracking
    779783enable_static
     
    794798LIBS
    795799CPPFLAGS
     800ADD_CFLAGS
    796801LT_SYS_LIBRARY_PATH
    797 CPP'
     802CPP
     803LT_LDFLAGS'
    798804
    799805
     
    14231429                          enable make rules and dependencies not useful (and
    14241430                          sometimes confusing) to the casual installer
     1431  --enable-relocatable    whether prefix in installed .pc files should be
     1432                          setup relative to pcfiledir
    14251433  --enable-dependency-tracking
    14261434                          do not reject slow dependency extractors
     
    14531461  CPPFLAGS    (Objective) C/C++ preprocessor flags, e.g. -I<include dir> if
    14541462              you have headers in a nonstandard directory <include dir>
     1463  ADD_CFLAGS  Additional C compiler options (if not overwriting CFLAGS)
    14551464  LT_SYS_LIBRARY_PATH
    14561465              User-defined run-time library search path.
    14571466  CPP         C preprocessor
     1467  LT_LDFLAGS  Flags passed to libtool when building libraries or executables
     1468              that are installed
    14581469
    14591470Use these variables to override the choices made by `configure' or to help
     
    24062417  if test "$enable_debug" = yes ; then
    24072418    if test "$enable_msvc" = yes ; then
    2408       : ${FFLAGS:="-nologo -fpp -Z7 -MDd"}
    2409       : ${FCFLAGS:="-nologo -fpp -Z7 -MDd"}
    2410       : ${CFLAGS:="-nologo -Z7 -MDd"}
    2411       : ${CXXFLAGS:="-nologo -EHs -Z7 -MDd"}
     2419      : ${FFLAGS:="-nologo -fpp -Z7 -MDd $ADD_FFLAGS"}
     2420      : ${FCFLAGS:="-nologo -fpp -Z7 -MDd $ADD_FCFLAGS"}
     2421      : ${CFLAGS:="-nologo -Z7 -MDd $ADD_CFLAGS"}
     2422      : ${CXXFLAGS:="-nologo -EHs -Z7 -MDd $ADD_CXXFLAGS"}
    24122423      : ${AR:="lib"}
    24132424      : ${AR_FLAGS:="-nologo -out:"}
    24142425    else
    2415       : ${FFLAGS:="-g"}
    2416       : ${FCFLAGS:="-g"}
    2417       : ${CFLAGS:="-g"}
    2418       : ${CXXFLAGS:="-g"}
     2426      : ${FFLAGS:="-g $ADD_FFLAGS"}
     2427      : ${FCFLAGS:="-g $ADD_FCFLAGS"}
     2428      : ${CFLAGS:="-g $ADD_CFLAGS"}
     2429      : ${CXXFLAGS:="-g $ADD_CXXFLAGS"}
    24192430    fi
    24202431  else
    24212432    if test "$enable_msvc" = yes ; then
    2422       : ${FFLAGS:="-nologo -fpp -O2 -MD"}
    2423       : ${FCFLAGS:="-nologo -fpp -O2 -MD"}
    2424       : ${CFLAGS:="-nologo -DNDEBUG -O2 -MD"}
    2425       : ${CXXFLAGS:="-nologo -EHs -DNDEBUG -O2 -MD"}
     2433      : ${FFLAGS:="-nologo -fpp -O2 -MD $ADD_FFLAGS"}
     2434      : ${FCFLAGS:="-nologo -fpp -O2 -MD $ADD_FCFLAGS"}
     2435      : ${CFLAGS:="-nologo -DNDEBUG -O2 -MD $ADD_CFLAGS"}
     2436      : ${CXXFLAGS:="-nologo -EHs -DNDEBUG -O2 -MD $ADD_CXXFLAGS"}
    24262437      : ${AR:="lib"}
    24272438      : ${AR_FLAGS:="-nologo -out:"}
    24282439    else
    2429       : ${FFLAGS:="-O2"}
    2430       : ${FCFLAGS:="-O2"}
    2431       : ${CFLAGS:="-O2 -DNDEBUG"}
    2432       : ${CXXFLAGS:="-O2 -DNDEBUG"}
     2440      : ${FFLAGS:="-O2 $ADD_FFLAGS"}
     2441      : ${FCFLAGS:="-O2 $ADD_FCFLAGS"}
     2442      : ${CFLAGS:="-O2 -DNDEBUG $ADD_CFLAGS"}
     2443      : ${CXXFLAGS:="-O2 -DNDEBUG $ADD_CXXFLAGS"}
    24332444    fi
    24342445  fi
     
    31703181  exec_prefix=$save_exec_prefix
    31713182
     3183# add a configure flag to indicate whether .pc files should be made relocatable
     3184# off by default, as it creates libtool warnings
     3185  # Check whether --enable-relocatable was given.
     3186if test "${enable_relocatable+set}" = set; then :
     3187  enableval=$enable_relocatable; coin_enable_relocatable=$enableval
     3188else
     3189  coin_enable_relocatable=no
     3190fi
     3191
     3192   if test $coin_enable_relocatable = yes; then
     3193  COIN_RELOCATABLE_TRUE=
     3194  COIN_RELOCATABLE_FALSE='#'
     3195else
     3196  COIN_RELOCATABLE_TRUE='#'
     3197  COIN_RELOCATABLE_FALSE=
     3198fi
     3199
     3200
    31723201
    31733202#############################################################################
     
    32463275
    32473276  # If enable-msvc, then test for Intel (on Windows) and MS C compiler
    3248   # explicitly and add compile-wrapper before AC_PROG_CC, because
    3249   # the compile-wrapper work around issues when having the wrong link.exe
    3250   # in the PATH first, which would upset tests in AC_PROG_CC.
    3251   # Further, if CC unset and not set by user, then stop with error.
     3277  # explicitly and add the compile wrapper before AC_PROG_CC. The compile
     3278  # wrapper works around issues related to finding MS link.exe. (Unix link.exe
     3279  # occurs first in PATH, which causes compile and link checks to fail.) For
     3280  # the same reason, set LD to use the compile wrapper. If CC remains unset
     3281  # (neither icl or cl was found, and CC was not set by the user), stop with
     3282  # an error.
     3283
    32523284  if test $enable_msvc = yes ; then
    32533285    for ac_prog in icl cl
     
    32953327    if test -n "$CC" ; then
    32963328      CC="$am_aux_dir/compile $CC"
     3329      ac_cv_prog_CC="$CC"
     3330      LD="$CC"
    32973331    else
    32983332      as_fn_error $? "Neither MS nor Intel C compiler found in PATH and CC is unset." "$LINENO" 5
     
    33003334  fi
    33013335
    3302   # look for some C compiler and check whether it works
    3303   # if user has set CC or we found icl/cl above, this shouldn't overwrite CC
    3304   # other than CXX of F77, this macro also takes care of adding the compile-wrapper
     3336  # Look for some C compiler and check that it works. If the user has set CC
     3337  # or we found icl/cl above, this shouldn't overwrite CC. Unlike the macros
     3338  # that establish C++ or Fortran compilers, PROG_CC also takes care of adding
     3339  # the compile wrapper if needed.
     3340
    33053341  ac_ext=c
    33063342ac_cpp='$CPP $CPPFLAGS'
     
    40864122fi
    40874123
     4124
     4125
     4126  # Declare precious variable for additional compiler flags
    40884127
    40894128
     
    1210812147#    regarding those that are properly marked for dll-export in the source.
    1210912148#
    12110 # Patch libtool also to circumbent some issues when using MinGW (Msys+GCC).
     12149# Patch libtool also to circumvent some issues when using MinGW (Msys+GCC).
    1211112150# 1. Relax check which libraries can be used when linking a DLL.
    1211212151#    libtool's func_mode_link() would reject linking MinGW system libraries,
     
    1213112170  esac
    1213212171
    12133   # Set up LT_LDFLAGS.
     12172  # Set up LT_LDFLAGS, user can initialize and we augment below
    1213412173
    1213512174
     
    1246912508if test -z "${MAINTAINER_MODE_TRUE}" && test -z "${MAINTAINER_MODE_FALSE}"; then
    1247012509  as_fn_error $? "conditional \"MAINTAINER_MODE\" was never defined.
     12510Usually this means the macro was only invoked conditionally." "$LINENO" 5
     12511fi
     12512if test -z "${COIN_RELOCATABLE_TRUE}" && test -z "${COIN_RELOCATABLE_FALSE}"; then
     12513  as_fn_error $? "conditional \"COIN_RELOCATABLE\" was never defined.
    1247112514Usually this means the macro was only invoked conditionally." "$LINENO" 5
    1247212515fi
Note: See TracChangeset for help on using the changeset viewer.