Changeset 2049


Ignore:
Timestamp:
Jan 1, 2011 11:55:58 AM (9 years ago)
Author:
stefan
Message:

remove ADDLIBS and variants; do not check for GNU_ZLIB in COIN_EXAMPLE_FILES

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/coin.m4

    r2048 r2049  
    6969
    7070AC_DEFUN([AC_COIN_PROJECTDIR_INIT],
    71 [# Initialize the ADDLIBS variable
    72 ADDLIBS="-lm $LIBS"
    73 AC_SUBST(ADDLIBS)
    74 
    75 # Initialize the PCADDLIBS variable.
    76 # This variable is used to setup library flags for the "Libs:" section in a .pc file.
    77 # In certain cases, it may contain more flags than the ADDLIBS variable.
    78 PCADDLIBS=""
    79 AC_SUBST(PCADDLIBS)
    80 
     71[
    8172# As backup, we make sure we don't loose an FLIBS if it has been set
    8273# by the user
    8374save_FLIBS="$FLIBS"
    84 
    85 # Initialize the FADDLIBS variable (which is to be used with a fortran
    86 # compiler and will not include FLIBS)
    87 FADDLIBS="$LIBS"
    88 AC_SUBST(FADDLIBS)
    8975
    9076# A useful makefile conditional that is always false
     
    567553fi
    568554
     555# correct the LD variable in a mingw build with MS or intel compiler
    569556case "$CXX" in
    570   cl* | */cl* | CL* | */CL* )
     557  cl* | */cl* | CL* | */CL* | icl* | */icl* | ICL* | */ICL*)
    571558    AC_COIN_MINGW_LD_FIX
    572559    ;;
     
    953940fi
    954941
    955 # Correct ADDLIBS initialization if we are using the MS compiler
     942# Correct the LD variable if we are using the MS or Intel-windows compiler
    956943case "$CC" in
    957944  cl* | */cl* | CL* | */CL* | icl* | */icl* | ICL* | */ICL*)
    958     ADDLIBS=
    959945    AC_COIN_MINGW_LD_FIX
    960946    ;;
     
    11691155fi
    11701156
     1157# correct the LD variable if we use the intel fortran compiler in windows
    11711158case "$F77" in
    11721159  ifort* | */ifort* | IFORT* | */IFORT*)
     
    19501937if test x$coin_skip_ac_output != xyes; then
    19511938
    1952   FADDLIBS="$ADDLIBS"
    1953   if test x"$coin_need_flibs" = xyes; then
    1954     ADDLIBS="$ADDLIBS $FLIBS"
    1955   fi
    1956   PCADDLIBS="$PCADDLIBS $ADDLIBS"
    1957 
    19581939  # library extension
    19591940  AC_SUBST(LIBEXT)
     
    21122093  if test $coin_has_zlib = yes; then
    21132094    AC_CHECK_LIB([z],[gzopen],
    2114                  [ADDLIBS="-lz $ADDLIBS"
    2115                   coin_foreach_w([myvar], [$1], [
     2095                 [coin_foreach_w([myvar], [$1], [
    21162096                    m4_toupper(myvar)_LIBS="-lz $m4_toupper(myvar)_LIBS"
    21172097                    m4_toupper(myvar)_PCLIBS="-lz $m4_toupper(myvar)_PCLIBS"
    21182098                    m4_toupper(myvar)_LIBS_INSTALLED="-lz $m4_toupper(myvar)_LIBS_INSTALLED"
    21192099                  ])
    2120                  ],
     2100                 :],
    21212101                 [coin_has_zlib=no])
    21222102  fi
     
    21522132  if test $coin_has_bzlib = yes; then
    21532133    AC_CHECK_LIB([bz2],[BZ2_bzReadOpen],
    2154                  [ADDLIBS="-lbz2 $ADDLIBS"
    2155                   coin_foreach_w([myvar], [$1], [
     2134                 [coin_foreach_w([myvar], [$1], [
    21562135                    m4_toupper(myvar)_LIBS="-lbz2 $m4_toupper(myvar)_LIBS"
    21572136                    m4_toupper(myvar)_PCLIBS="-lbz2 $m4_toupper(myvar)_PCLIBS"
    21582137                    m4_toupper(myvar)_LIBS_INSTALLED="-lbz2 $m4_toupper(myvar)_LIBS_INSTALLED"
    21592138                  ])
    2160                  ],
     2139                 :],
    21612140                 [coin_has_bzlib=no])
    21622141  fi
     
    22042183  if test $coin_has_readline = yes; then
    22052184    AC_CHECK_LIB([readline],[readline],
    2206                  [ADDLIBS="-lreadline $LIBS $ADDLIBS"
    2207                   coin_foreach_w([myvar], [$1], [
     2185                 [coin_foreach_w([myvar], [$1], [
    22082186                    m4_toupper(myvar)_LIBS="-lreadline $LIBS $m4_toupper(myvar)_LIBS"
    22092187                    m4_toupper(myvar)_PCLIBS="-lreadline $LIBS $m4_toupper(myvar)_PCLIBS"
    22102188                    m4_toupper(myvar)_LIBS_INSTALLED="-lreadline $LIBS $m4_toupper(myvar)_LIBS_INSTALLED"
    22112189                  ])
    2212                  ],
     2190                 :],
    22132191                 [coin_has_readline=no])
    22142192  fi
     
    23262304
    23272305AC_DEFUN([AC_COIN_EXAMPLE_FILES],
    2328 [AC_REQUIRE([AC_COIN_CHECK_GNU_ZLIB])
    2329 AC_REQUIRE([AC_COIN_CHECK_VPATH])
     2306[AC_REQUIRE([AC_COIN_CHECK_VPATH])
    23302307AC_REQUIRE([AC_COIN_ENABLE_DOSCOMPILE])
    23312308AC_REQUIRE([AC_PROG_LN_S])
     
    24872464        [if test x"$m4_tolower($1)_libcheck" != xno; then
    24882465           coin_save_LIBS="$LIBS"
    2489            LIBS="$$2LIB $ADDLIBS $5"
     2466           LIBS="$$2LIB $5"
    24902467           coin_$2_link=no
    24912468           AC_LANG_PUSH(C)
     
    25062483
    25072484# If we make it this far, we've verified the file and linked the function. Add
    2508 # the necessary link flags to ADDLIBS and $6_{PC}LIBS and define the preprocessor symbol
     2485# the necessary link flags to $6_{PC}LIBS and define the preprocessor symbol
    25092486# COIN_HAS_LBRY.
    25102487
    2511     ADDLIBS="$$2LIB $ADDLIBS"
    25122488    coin_foreach_w([myvar], [$6], [
    25132489      m4_toupper(myvar)_LIBS="$$2LIB $m4_toupper(myvar)_LIBS"
Note: See TracChangeset for help on using the changeset viewer.