Changeset 2421


Ignore:
Timestamp:
Sep 3, 2011 12:11:14 PM (8 years ago)
Author:
stefan
Message:

enable zlib and bzlib by default, do not require --enable-gnu-packages anymore, since these are no gnu packages; instead, add option to disable each of them

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/coin.m4

    r2335 r2421  
    21122112# it adds the linker flag to the variables X_LIBS, X_PCLIBS, and X_LIBS_INSTALLED.
    21132113
     2114# TODO the macro name should be changed to AC_COIN_CHECK_ZLIB
     2115
    21142116AC_DEFUN([AC_COIN_CHECK_GNU_ZLIB],
    2115 [AC_REQUIRE([AC_COIN_ENABLE_GNU_PACKAGES])
     2117[
    21162118AC_BEFORE([AC_COIN_PROG_CXX],[$0])
    21172119AC_BEFORE([AC_COIN_PROG_CC],[$0])
     
    21202122
    21212123coin_has_zlib=no
    2122 if test $coin_enable_gnu = yes; then
     2124
     2125AC_ARG_ENABLE([zlib],
     2126              [AC_HELP_STRING([--disable-zlib],[do not compile with compression library zlib])],
     2127              [coin_enable_zlib=$enableval],
     2128              [coin_enable_zlib=yes])
     2129
     2130if test $coin_enable_zlib = yes; then
    21232131  AC_COIN_CHECK_HEADER([zlib.h],[coin_has_zlib=yes])
    21242132
     
    21512159# of arguments X, it adds the linker flag to the variables X_LIBS, X_PCLIBS, and X_LIBS_INSTALLED.
    21522160
     2161# TODO the macro name should be changed to AC_COIN_CHECK_BZLIB
     2162
    21532163AC_DEFUN([AC_COIN_CHECK_GNU_BZLIB],
    2154 [AC_REQUIRE([AC_COIN_ENABLE_GNU_PACKAGES])
     2164[
    21552165AC_BEFORE([AC_COIN_PROG_CXX],[$0])
    21562166AC_BEFORE([AC_COIN_PROG_CC],[$0])
     
    21582168AC_BEFORE([$0],[AC_COIN_FINALIZE])
    21592169
     2170AC_ARG_ENABLE([bzlib],
     2171              [AC_HELP_STRING([--disable-bzlib],[do not compile with compression library bzlib])],
     2172              [coin_enable_bzlib=$enableval],
     2173              [coin_enable_bzlib=yes])
     2174
    21602175coin_has_bzlib=no
    2161 if test $coin_enable_gnu = yes; then
     2176if test $coin_enable_bzlib = yes; then
    21622177  AC_COIN_CHECK_HEADER([bzlib.h],[coin_has_bzlib=yes])
    21632178
Note: See TracChangeset for help on using the changeset viewer.