Changeset 4074


Ignore:
Timestamp:
Jan 21, 2020 9:47:33 AM (3 months ago)
Author:
stefan
Message:

rerun autotools; replace LIBDIR_IS_DEFAULT by COIN_RELOCATABLE

Location:
ThirdParty/Mumps/trunk
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • ThirdParty/Mumps/trunk/Makefile.in

    r4049 r4074  
    265265AM_RECURSIVE_TARGETS = cscope
    266266ACLOCAL = @ACLOCAL@
     267ADD_CFLAGS = @ADD_CFLAGS@
     268ADD_FCFLAGS = @ADD_FCFLAGS@
    267269AMTAR = @AMTAR@
    268270AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
  • ThirdParty/Mumps/trunk/coinmumps.pc.in

    r4066 r4074  
    1 @LIBDIR_IS_DEFAULT_FALSE@prefix=@prefix@
    2 @LIBDIR_IS_DEFAULT_TRUE@prefix=${pcfiledir}/../..
     1@COIN_RELOCATABLE_FALSE@prefix=@prefix@
     2@COIN_RELOCATABLE_TRUE@prefix=${pcfiledir}/../..
    33exec_prefix=@exec_prefix@
    44libdir=@libdir@
  • ThirdParty/Mumps/trunk/configure

    r4066 r4074  
    686686DLLTOOL
    687687AS
     688ADD_FCFLAGS
    688689ac_ct_FC
    689690FCFLAGS
    690691FC
     692ADD_CFLAGS
    691693am__fastdepCC_FALSE
    692694am__fastdepCC_TRUE
     
    704706LDFLAGS
    705707CFLAGS
    706 LIBDIR_IS_DEFAULT_FALSE
    707 LIBDIR_IS_DEFAULT_TRUE
     708COIN_RELOCATABLE_FALSE
     709COIN_RELOCATABLE_TRUE
    708710MAINT
    709711MAINTAINER_MODE_FALSE
     
    793795enable_silent_rules
    794796enable_maintainer_mode
     797enable_relocatable
    795798enable_dependency_tracking
    796799enable_static
     
    818821LIBS
    819822CPPFLAGS
     823ADD_CFLAGS
    820824FC
    821825FCFLAGS
     826ADD_FCFLAGS
    822827LT_SYS_LIBRARY_PATH
    823828CPP
     
    14501455                          enable make rules and dependencies not useful (and
    14511456                          sometimes confusing) to the casual installer
     1457  --enable-relocatable    whether prefix in installed .pc files should be
     1458                          setup relative to pcfiledir
    14521459  --enable-dependency-tracking
    14531460                          do not reject slow dependency extractors
     
    15001507  CPPFLAGS    (Objective) C/C++ preprocessor flags, e.g. -I<include dir> if
    15011508              you have headers in a nonstandard directory <include dir>
     1509  ADD_CFLAGS  Additional C compiler options (if not overwriting CFLAGS)
    15021510  FC          Fortran compiler command
    15031511  FCFLAGS     Fortran compiler flags
     1512  ADD_FCFLAGS Additional Fortran compiler options (if not overwriting FCFLAGS)
    15041513  LT_SYS_LIBRARY_PATH
    15051514              User-defined run-time library search path.
     
    25402549  if test "$enable_debug" = yes ; then
    25412550    if test "$enable_msvc" = yes ; then
    2542       : ${FFLAGS:="-nologo -fpp -Z7 -MDd"}
    2543       : ${FCFLAGS:="-nologo -fpp -Z7 -MDd"}
    2544       : ${CFLAGS:="-nologo -Z7 -MDd"}
    2545       : ${CXXFLAGS:="-nologo -EHs -Z7 -MDd"}
     2551      : ${FFLAGS:="-nologo -fpp -Z7 -MDd $ADD_FFLAGS"}
     2552      : ${FCFLAGS:="-nologo -fpp -Z7 -MDd $ADD_FCFLAGS"}
     2553      : ${CFLAGS:="-nologo -Z7 -MDd $ADD_CFLAGS"}
     2554      : ${CXXFLAGS:="-nologo -EHs -Z7 -MDd $ADD_CXXFLAGS"}
    25462555      : ${AR:="lib"}
    25472556      : ${AR_FLAGS:="-nologo -out:"}
    25482557    else
    2549       : ${FFLAGS:="-g"}
    2550       : ${FCFLAGS:="-g"}
    2551       : ${CFLAGS:="-g"}
    2552       : ${CXXFLAGS:="-g"}
     2558      : ${FFLAGS:="-g $ADD_FFLAGS"}
     2559      : ${FCFLAGS:="-g $ADD_FCFLAGS"}
     2560      : ${CFLAGS:="-g $ADD_CFLAGS"}
     2561      : ${CXXFLAGS:="-g $ADD_CXXFLAGS"}
    25532562    fi
    25542563  else
    25552564    if test "$enable_msvc" = yes ; then
    2556       : ${FFLAGS:="-nologo -fpp -O2 -MD"}
    2557       : ${FCFLAGS:="-nologo -fpp -O2 -MD"}
    2558       : ${CFLAGS:="-nologo -DNDEBUG -O2 -MD"}
    2559       : ${CXXFLAGS:="-nologo -EHs -DNDEBUG -O2 -MD"}
     2565      : ${FFLAGS:="-nologo -fpp -O2 -MD $ADD_FFLAGS"}
     2566      : ${FCFLAGS:="-nologo -fpp -O2 -MD $ADD_FCFLAGS"}
     2567      : ${CFLAGS:="-nologo -DNDEBUG -O2 -MD $ADD_CFLAGS"}
     2568      : ${CXXFLAGS:="-nologo -EHs -DNDEBUG -O2 -MD $ADD_CXXFLAGS"}
    25602569      : ${AR:="lib"}
    25612570      : ${AR_FLAGS:="-nologo -out:"}
    25622571    else
    2563       : ${FFLAGS:="-O2"}
    2564       : ${FCFLAGS:="-O2"}
    2565       : ${CFLAGS:="-O2 -DNDEBUG"}
    2566       : ${CXXFLAGS:="-O2 -DNDEBUG"}
     2572      : ${FFLAGS:="-O2 $ADD_FFLAGS"}
     2573      : ${FCFLAGS:="-O2 $ADD_FCFLAGS"}
     2574      : ${CFLAGS:="-O2 -DNDEBUG $ADD_CFLAGS"}
     2575      : ${CXXFLAGS:="-O2 -DNDEBUG $ADD_CXXFLAGS"}
    25672576    fi
    25682577  fi
     
    33013310    eval expanded_libdir=$expanded_libdir
    33023311  done
    3303 
    3304    if test "$expanded_libdir" = "$prefix/lib"; then
    3305   LIBDIR_IS_DEFAULT_TRUE=
    3306   LIBDIR_IS_DEFAULT_FALSE='#'
    3307 else
    3308   LIBDIR_IS_DEFAULT_TRUE='#'
    3309   LIBDIR_IS_DEFAULT_FALSE=
    3310 fi
    3311 
    3312 
    33133312  prefix=$save_prefix
    33143313  exec_prefix=$save_exec_prefix
     3314
     3315# add a configure flag to indicate whether .pc files should be made relocatable
     3316# off by default, as it creates libtool warnings
     3317  # Check whether --enable-relocatable was given.
     3318if test "${enable_relocatable+set}" = set; then :
     3319  enableval=$enable_relocatable; coin_enable_relocatable=$enableval
     3320else
     3321  coin_enable_relocatable=no
     3322fi
     3323
     3324   if test $coin_enable_relocatable = yes; then
     3325  COIN_RELOCATABLE_TRUE=
     3326  COIN_RELOCATABLE_FALSE='#'
     3327else
     3328  COIN_RELOCATABLE_TRUE='#'
     3329  COIN_RELOCATABLE_FALSE=
     3330fi
     3331
    33153332
    33163333
     
    42404257
    42414258
     4259  # Declare precious variable for additional compiler flags
     4260
     4261
    42424262
    42434263# Get the name of the Fortran compiler and appropriate compiler options
     
    45784598    fi
    45794599  fi
     4600
     4601  # Declare precious variable for additional compiler flags
     4602
    45804603
    45814604
     
    1855518578Usually this means the macro was only invoked conditionally." "$LINENO" 5
    1855618579fi
    18557 if test -z "${LIBDIR_IS_DEFAULT_TRUE}" && test -z "${LIBDIR_IS_DEFAULT_FALSE}"; then
    18558   as_fn_error $? "conditional \"LIBDIR_IS_DEFAULT\" was never defined.
     18580if test -z "${COIN_RELOCATABLE_TRUE}" && test -z "${COIN_RELOCATABLE_FALSE}"; then
     18581  as_fn_error $? "conditional \"COIN_RELOCATABLE\" was never defined.
    1855918582Usually this means the macro was only invoked conditionally." "$LINENO" 5
    1856018583fi
Note: See TracChangeset for help on using the changeset viewer.