Changeset 4070 for ThirdParty/Glpk/trunk


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

rerun autotools; replace LIBDIR_IS_DEFAULT by COIN_RELOCATABLE

Location:
ThirdParty/Glpk/trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • ThirdParty/Glpk/trunk/coinglpk.pc.in

    r4063 r4070  
    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/Glpk/trunk/configure

    r4063 r4070  
    596596LIBOBJS
    597597subdirs
    598 LIBDIR_IS_DEFAULT_FALSE
    599 LIBDIR_IS_DEFAULT_TRUE
     598COIN_RELOCATABLE_FALSE
     599COIN_RELOCATABLE_TRUE
    600600MAINT
    601601MAINTAINER_MODE_FALSE
     
    684684enable_silent_rules
    685685enable_maintainer_mode
     686enable_relocatable
    686687'
    687688      ac_precious_vars='build_alias
     
    13151316                          enable make rules and dependencies not useful (and
    13161317                          sometimes confusing) to the casual installer
     1318  --enable-relocatable    whether prefix in installed .pc files should be
     1319                          setup relative to pcfiledir
    13171320
    13181321Report bugs to <http://projects.coin-or.org/BuildTools/newticket>.
     
    19131916  if test "$enable_debug" = yes ; then
    19141917    if test "$enable_msvc" = yes ; then
    1915       : ${FFLAGS:="-nologo -fpp -Z7 -MDd"}
    1916       : ${FCFLAGS:="-nologo -fpp -Z7 -MDd"}
    1917       : ${CFLAGS:="-nologo -Z7 -MDd"}
    1918       : ${CXXFLAGS:="-nologo -EHs -Z7 -MDd"}
     1918      : ${FFLAGS:="-nologo -fpp -Z7 -MDd $ADD_FFLAGS"}
     1919      : ${FCFLAGS:="-nologo -fpp -Z7 -MDd $ADD_FCFLAGS"}
     1920      : ${CFLAGS:="-nologo -Z7 -MDd $ADD_CFLAGS"}
     1921      : ${CXXFLAGS:="-nologo -EHs -Z7 -MDd $ADD_CXXFLAGS"}
    19191922      : ${AR:="lib"}
    19201923      : ${AR_FLAGS:="-nologo -out:"}
    19211924    else
    1922       : ${FFLAGS:="-g"}
    1923       : ${FCFLAGS:="-g"}
    1924       : ${CFLAGS:="-g"}
    1925       : ${CXXFLAGS:="-g"}
     1925      : ${FFLAGS:="-g $ADD_FFLAGS"}
     1926      : ${FCFLAGS:="-g $ADD_FCFLAGS"}
     1927      : ${CFLAGS:="-g $ADD_CFLAGS"}
     1928      : ${CXXFLAGS:="-g $ADD_CXXFLAGS"}
    19261929    fi
    19271930  else
    19281931    if test "$enable_msvc" = yes ; then
    1929       : ${FFLAGS:="-nologo -fpp -O2 -MD"}
    1930       : ${FCFLAGS:="-nologo -fpp -O2 -MD"}
    1931       : ${CFLAGS:="-nologo -DNDEBUG -O2 -MD"}
    1932       : ${CXXFLAGS:="-nologo -EHs -DNDEBUG -O2 -MD"}
     1932      : ${FFLAGS:="-nologo -fpp -O2 -MD $ADD_FFLAGS"}
     1933      : ${FCFLAGS:="-nologo -fpp -O2 -MD $ADD_FCFLAGS"}
     1934      : ${CFLAGS:="-nologo -DNDEBUG -O2 -MD $ADD_CFLAGS"}
     1935      : ${CXXFLAGS:="-nologo -EHs -DNDEBUG -O2 -MD $ADD_CXXFLAGS"}
    19331936      : ${AR:="lib"}
    19341937      : ${AR_FLAGS:="-nologo -out:"}
    19351938    else
    1936       : ${FFLAGS:="-O2"}
    1937       : ${FCFLAGS:="-O2"}
    1938       : ${CFLAGS:="-O2 -DNDEBUG"}
    1939       : ${CXXFLAGS:="-O2 -DNDEBUG"}
     1939      : ${FFLAGS:="-O2 $ADD_FFLAGS"}
     1940      : ${FCFLAGS:="-O2 $ADD_FCFLAGS"}
     1941      : ${CFLAGS:="-O2 -DNDEBUG $ADD_CFLAGS"}
     1942      : ${CXXFLAGS:="-O2 -DNDEBUG $ADD_CXXFLAGS"}
    19401943    fi
    19411944  fi
     
    26742677    eval expanded_libdir=$expanded_libdir
    26752678  done
    2676 
    2677    if test "$expanded_libdir" = "$prefix/lib"; then
    2678   LIBDIR_IS_DEFAULT_TRUE=
    2679   LIBDIR_IS_DEFAULT_FALSE='#'
    2680 else
    2681   LIBDIR_IS_DEFAULT_TRUE='#'
    2682   LIBDIR_IS_DEFAULT_FALSE=
    2683 fi
    2684 
    2685 
    26862679  prefix=$save_prefix
    26872680  exec_prefix=$save_exec_prefix
     2681
     2682# add a configure flag to indicate whether .pc files should be made relocatable
     2683# off by default, as it creates libtool warnings
     2684  # Check whether --enable-relocatable was given.
     2685if test "${enable_relocatable+set}" = set; then :
     2686  enableval=$enable_relocatable; coin_enable_relocatable=$enableval
     2687else
     2688  coin_enable_relocatable=no
     2689fi
     2690
     2691   if test $coin_enable_relocatable = yes; then
     2692  COIN_RELOCATABLE_TRUE=
     2693  COIN_RELOCATABLE_FALSE='#'
     2694else
     2695  COIN_RELOCATABLE_TRUE='#'
     2696  COIN_RELOCATABLE_FALSE=
     2697fi
     2698
    26882699
    26892700
     
    28732884Usually this means the macro was only invoked conditionally." "$LINENO" 5
    28742885fi
    2875 if test -z "${LIBDIR_IS_DEFAULT_TRUE}" && test -z "${LIBDIR_IS_DEFAULT_FALSE}"; then
    2876   as_fn_error $? "conditional \"LIBDIR_IS_DEFAULT\" was never defined.
     2886if test -z "${COIN_RELOCATABLE_TRUE}" && test -z "${COIN_RELOCATABLE_FALSE}"; then
     2887  as_fn_error $? "conditional \"COIN_RELOCATABLE\" was never defined.
    28772888Usually this means the macro was only invoked conditionally." "$LINENO" 5
    28782889fi
Note: See TracChangeset for help on using the changeset viewer.