Changeset 4109


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

sync with trunk

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

Legend:

Unmodified
Added
Removed
  • ThirdParty/ASL/stable/2.0

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

    r4022 r4109  
    303303AM_RECURSIVE_TARGETS = cscope
    304304ACLOCAL = @ACLOCAL@
     305ADD_CFLAGS = @ADD_CFLAGS@
    305306AMTAR = @AMTAR@
    306307AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
  • ThirdParty/ASL/stable/2.0/coinasl.pc.in

    r4022 r4109  
    1 prefix=@prefix@
     1@COIN_RELOCATABLE_FALSE@prefix=@prefix@
     2@COIN_RELOCATABLE_TRUE@prefix=${pcfiledir}/../..
    23exec_prefix=@exec_prefix@
    34libdir=@libdir@
  • ThirdParty/ASL/stable/2.0/configure

    r4028 r4109  
    673673SED
    674674LIBTOOL
     675ADD_CFLAGS
    675676am__fastdepCC_FALSE
    676677am__fastdepCC_TRUE
     
    688689LDFLAGS
    689690CFLAGS
     691COIN_RELOCATABLE_FALSE
     692COIN_RELOCATABLE_TRUE
    690693MAINT
    691694MAINTAINER_MODE_FALSE
     
    775778enable_silent_rules
    776779enable_maintainer_mode
     780enable_relocatable
    777781enable_dependency_tracking
    778782enable_static
     
    793797LIBS
    794798CPPFLAGS
     799ADD_CFLAGS
    795800LT_SYS_LIBRARY_PATH
    796 CPP'
     801CPP
     802LT_LDFLAGS'
    797803
    798804
     
    14221428                          enable make rules and dependencies not useful (and
    14231429                          sometimes confusing) to the casual installer
     1430  --enable-relocatable    whether prefix in installed .pc files should be
     1431                          setup relative to pcfiledir
    14241432  --enable-dependency-tracking
    14251433                          do not reject slow dependency extractors
     
    14521460  CPPFLAGS    (Objective) C/C++ preprocessor flags, e.g. -I<include dir> if
    14531461              you have headers in a nonstandard directory <include dir>
     1462  ADD_CFLAGS  Additional C compiler options (if not overwriting CFLAGS)
    14541463  LT_SYS_LIBRARY_PATH
    14551464              User-defined run-time library search path.
    14561465  CPP         C preprocessor
     1466  LT_LDFLAGS  Flags passed to libtool when building libraries or executables
     1467              that are installed
    14571468
    14581469Use these variables to override the choices made by `configure' or to help
     
    23682379  if test "$enable_debug" = yes ; then
    23692380    if test "$enable_msvc" = yes ; then
    2370       : ${FFLAGS:="-nologo -fpp -Z7 -MDd"}
    2371       : ${FCFLAGS:="-nologo -fpp -Z7 -MDd"}
    2372       : ${CFLAGS:="-nologo -Z7 -MDd"}
    2373       : ${CXXFLAGS:="-nologo -EHs -Z7 -MDd"}
     2381      : ${FFLAGS:="-nologo -fpp -Z7 -MDd $ADD_FFLAGS"}
     2382      : ${FCFLAGS:="-nologo -fpp -Z7 -MDd $ADD_FCFLAGS"}
     2383      : ${CFLAGS:="-nologo -Z7 -MDd $ADD_CFLAGS"}
     2384      : ${CXXFLAGS:="-nologo -EHs -Z7 -MDd $ADD_CXXFLAGS"}
    23742385      : ${AR:="lib"}
    23752386      : ${AR_FLAGS:="-nologo -out:"}
    23762387    else
    2377       : ${FFLAGS:="-g"}
    2378       : ${FCFLAGS:="-g"}
    2379       : ${CFLAGS:="-g"}
    2380       : ${CXXFLAGS:="-g"}
     2388      : ${FFLAGS:="-g $ADD_FFLAGS"}
     2389      : ${FCFLAGS:="-g $ADD_FCFLAGS"}
     2390      : ${CFLAGS:="-g $ADD_CFLAGS"}
     2391      : ${CXXFLAGS:="-g $ADD_CXXFLAGS"}
    23812392    fi
    23822393  else
    23832394    if test "$enable_msvc" = yes ; then
    2384       : ${FFLAGS:="-nologo -fpp -O2 -MD"}
    2385       : ${FCFLAGS:="-nologo -fpp -O2 -MD"}
    2386       : ${CFLAGS:="-nologo -DNDEBUG -O2 -MD"}
    2387       : ${CXXFLAGS:="-nologo -EHs -DNDEBUG -O2 -MD"}
     2395      : ${FFLAGS:="-nologo -fpp -O2 -MD $ADD_FFLAGS"}
     2396      : ${FCFLAGS:="-nologo -fpp -O2 -MD $ADD_FCFLAGS"}
     2397      : ${CFLAGS:="-nologo -DNDEBUG -O2 -MD $ADD_CFLAGS"}
     2398      : ${CXXFLAGS:="-nologo -EHs -DNDEBUG -O2 -MD $ADD_CXXFLAGS"}
    23882399      : ${AR:="lib"}
    23892400      : ${AR_FLAGS:="-nologo -out:"}
    23902401    else
    2391       : ${FFLAGS:="-O2"}
    2392       : ${FCFLAGS:="-O2"}
    2393       : ${CFLAGS:="-O2 -DNDEBUG"}
    2394       : ${CXXFLAGS:="-O2 -DNDEBUG"}
     2402      : ${FFLAGS:="-O2 $ADD_FFLAGS"}
     2403      : ${FCFLAGS:="-O2 $ADD_FCFLAGS"}
     2404      : ${CFLAGS:="-O2 -DNDEBUG $ADD_CFLAGS"}
     2405      : ${CXXFLAGS:="-O2 -DNDEBUG $ADD_CXXFLAGS"}
    23952406    fi
    23962407  fi
     
    31323143  exec_prefix=$save_exec_prefix
    31333144
     3145# add a configure flag to indicate whether .pc files should be made relocatable
     3146# off by default, as it creates libtool warnings
     3147  # Check whether --enable-relocatable was given.
     3148if test "${enable_relocatable+set}" = set; then :
     3149  enableval=$enable_relocatable; coin_enable_relocatable=$enableval
     3150else
     3151  coin_enable_relocatable=no
     3152fi
     3153
     3154   if test $coin_enable_relocatable = yes; then
     3155  COIN_RELOCATABLE_TRUE=
     3156  COIN_RELOCATABLE_FALSE='#'
     3157else
     3158  COIN_RELOCATABLE_TRUE='#'
     3159  COIN_RELOCATABLE_FALSE=
     3160fi
     3161
     3162
    31343163
    31353164# Get the name of the C compiler and compiler flags
     
    32053234
    32063235  # If enable-msvc, then test for Intel (on Windows) and MS C compiler
    3207   # explicitly and add compile-wrapper before AC_PROG_CC, because
    3208   # the compile-wrapper work around issues when having the wrong link.exe
    3209   # in the PATH first, which would upset tests in AC_PROG_CC.
    3210   # Further, if CC unset and not set by user, then stop with error.
     3236  # explicitly and add the compile wrapper before AC_PROG_CC. The compile
     3237  # wrapper works around issues related to finding MS link.exe. (Unix link.exe
     3238  # occurs first in PATH, which causes compile and link checks to fail.) For
     3239  # the same reason, set LD to use the compile wrapper. If CC remains unset
     3240  # (neither icl or cl was found, and CC was not set by the user), stop with
     3241  # an error.
     3242
    32113243  if test $enable_msvc = yes ; then
    32123244    for ac_prog in icl cl
     
    32543286    if test -n "$CC" ; then
    32553287      CC="$am_aux_dir/compile $CC"
     3288      ac_cv_prog_CC="$CC"
     3289      LD="$CC"
    32563290    else
    32573291      as_fn_error $? "Neither MS nor Intel C compiler found in PATH and CC is unset." "$LINENO" 5
     
    32593293  fi
    32603294
    3261   # look for some C compiler and check whether it works
    3262   # if user has set CC or we found icl/cl above, this shouldn't overwrite CC
    3263   # other than CXX of F77, this macro also takes care of adding the compile-wrapper
     3295  # Look for some C compiler and check that it works. If the user has set CC
     3296  # or we found icl/cl above, this shouldn't overwrite CC. Unlike the macros
     3297  # that establish C++ or Fortran compilers, PROG_CC also takes care of adding
     3298  # the compile wrapper if needed.
     3299
    32643300  ac_ext=c
    32653301ac_cpp='$CPP $CPPFLAGS'
     
    40454081fi
    40464082
     4083
     4084
     4085  # Declare precious variable for additional compiler flags
    40474086
    40484087
     
    1206612105#    regarding those that are properly marked for dll-export in the source.
    1206712106#
    12068 # Patch libtool also to circumbent some issues when using MinGW (Msys+GCC).
     12107# Patch libtool also to circumvent some issues when using MinGW (Msys+GCC).
    1206912108# 1. Relax check which libraries can be used when linking a DLL.
    1207012109#    libtool's func_mode_link() would reject linking MinGW system libraries,
     
    1208912128  esac
    1209012129
    12091   # Set up LT_LDFLAGS.
     12130  # Set up LT_LDFLAGS, user can initialize and we augment below
    1209212131
    1209312132
     
    1254412583if test -z "${MAINTAINER_MODE_TRUE}" && test -z "${MAINTAINER_MODE_FALSE}"; then
    1254512584  as_fn_error $? "conditional \"MAINTAINER_MODE\" was never defined.
     12585Usually this means the macro was only invoked conditionally." "$LINENO" 5
     12586fi
     12587if test -z "${COIN_RELOCATABLE_TRUE}" && test -z "${COIN_RELOCATABLE_FALSE}"; then
     12588  as_fn_error $? "conditional \"COIN_RELOCATABLE\" was never defined.
    1254612589Usually this means the macro was only invoked conditionally." "$LINENO" 5
    1254712590fi
Note: See TracChangeset for help on using the changeset viewer.