diff options
author | Peter Breitenlohner <peb@mppmu.mpg.de> | 2010-12-07 15:06:47 +0000 |
---|---|---|
committer | Peter Breitenlohner <peb@mppmu.mpg.de> | 2010-12-07 15:06:47 +0000 |
commit | 8eec1138666490fba3cabc5da0e8bbba772373c0 (patch) | |
tree | ffc7fd498102faaebe7b25f9595db11c50d8b846 /Build/source/libs/zlib/configure.ac | |
parent | 20b9f354ee6de89e33030360df3e774ab1b7c470 (diff) |
remove obsolete zlib-1.2.3
git-svn-id: svn://tug.org/texlive/trunk@20674 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/libs/zlib/configure.ac')
-rw-r--r-- | Build/source/libs/zlib/configure.ac | 17 |
1 files changed, 2 insertions, 15 deletions
diff --git a/Build/source/libs/zlib/configure.ac b/Build/source/libs/zlib/configure.ac index b0ee5c21ba3..fe66357d9d9 100644 --- a/Build/source/libs/zlib/configure.ac +++ b/Build/source/libs/zlib/configure.ac @@ -38,18 +38,7 @@ AC_CHECK_HEADER([errno.h], [ZLIB_DEFINES="-DNO_ERRNO_H"]) AC_CHECK_HEADERS([unistd.h]) -dnl zlib-1.2.3 has zconf.in.h, whereas zlib-1.2.5 has zconf.h.in -m4_if(zlib_version, [1.2.3], - [ -ZCONF_SRC=zlib-[]zlib_version/zconf.in.h -if test x"$ac_cv_header_unistd_h" = xyes; then - zconf_sh='sed <$srcdir/'"$ZCONF_SRC"' "/HAVE_UNISTD_H/s%0%1%" >' -else - zconf_sh='cp $srcdir/'"$ZCONF_SRC" -fi -AC_SUBST([OTHER_TREE], [zlib-1.2.5])], - [ -ZCONF_SRC=zlib-[]zlib_version/zconf.h.in +ZCONF_SRC=[zlib-]zlib_version[/zconf.h.in] if test x"$ac_cv_header_unistd_h" = xyes; then zconf_sh='sed <$srcdir/'"$ZCONF_SRC"' "/^#ifdef HAVE_UNISTD_H.* may be/s/def HAVE_UNISTD_H\\(.*\\) may be/ 1\\1 was/" >' else @@ -71,8 +60,6 @@ AS_CASE([$ac_cv_sys_largefile_source], [no | unknown], [], [ZLIB_DEFINES="$ZLIB_DEFINES -D_LARGEFILE_SOURCE=1"]) -AC_SUBST([OTHER_TREE], [zlib-1.2.3])]) -AM_CONDITIONAL([ZLIB123], [test "x]zlib_version[" = x1.2.3]) AC_CONFIG_COMMANDS([zconf.h], [eval "$zconf_sh" zconf.h], [zconf_sh='$zconf_sh']) @@ -89,7 +76,7 @@ caddr_t hello() { [AC_MSG_RESULT([no])]) AC_SUBST([ZLIB_DEFINES]) -ZLIB_TREE=zlib-[]zlib_version +ZLIB_TREE=[zlib-]zlib_version AC_SUBST([ZLIB_TREE]) if test -f $srcdir/$ZLIB_TREE/zconf.h; then |