Changeset 1837


Ignore:
Timestamp:
May 9, 2010 1:45:41 PM (6 years ago)
Author:
warmerdam
Message:

attempt to correct implementation of --with-zlib and --with-libz aliases (#23)

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/libgeotiff/configure.ac

    r1677 r1837  
    102102    AC_HELP_STRING([--with-zip=ARG], [zlib library to use (yes or path)]),,)
    103103
    104 AC_ARG_WITH([zip1],
     104AC_ARG_WITH([zlib],
    105105    AC_HELP_STRING([--with-zlib=ARG], [ alias for --with-zip]),,)
    106106
    107 AC_ARG_WITH([zip2],
     107AC_ARG_WITH([libz],
    108108    AC_HELP_STRING([--with-libz=ARG], [ alias for --with-zip]),,)
    109109
     
    111111ZIP_CONFIG="no"
    112112
    113 if test "$with_zip" != "" -o "$with_zlib" != "" -o "$with_libz" != ""; then
     113# Implement aliasing...
     114
     115if test "$with_zlib" != "" ; then
     116  with_zip=$with_zlib
     117fi
     118if test "$with_libz" != "" ; then
     119  with_zip=$with_libz
     120fi
     121
     122
     123if test "$with_zip" != "" -a "x$with_zip" != "xno" ; then
    114124    AC_CHECK_HEADERS([zlib.h],, [AC_MSG_ERROR([cannot find zlib.h, bailing out])])
    115125    AC_SEARCH_LIBS([inflateInit_], [z],
Note: See TracChangeset for help on using the changeset viewer.