summaryrefslogtreecommitdiff
path: root/Build/source/libs/libpng
diff options
context:
space:
mode:
authorPeter Breitenlohner <peb@mppmu.mpg.de>2009-03-25 10:27:56 +0000
committerPeter Breitenlohner <peb@mppmu.mpg.de>2009-03-25 10:27:56 +0000
commit14fdf58582eb34614c899048041260830bf11319 (patch)
tree24c257e172a5759d4653886820e0debc19a79e75 /Build/source/libs/libpng
parent1d49a87a191295313dd1fdbce07dfb18ddd65bfc (diff)
new build system: update
git-svn-id: svn://tug.org/texlive/trunk@12515 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/libs/libpng')
-rwxr-xr-xBuild/source/libs/libpng/configure10
-rw-r--r--Build/source/libs/libpng/configure.ac9
2 files changed, 8 insertions, 11 deletions
diff --git a/Build/source/libs/libpng/configure b/Build/source/libs/libpng/configure
index bd3896c9e5d..3c6a64a92fc 100755
--- a/Build/source/libs/libpng/configure
+++ b/Build/source/libs/libpng/configure
@@ -5136,12 +5136,13 @@ fi
# don't run any tests for '--disable-build', there may be no zlib.
if test "x$enable_build" != xno; then
-save_CPPFLAGS=$CPPFLAGS
-save_LIBS=$LIBS
+kpse_save_CPPFLAGS=$CPPFLAGS
+kpse_save_LIBS=$LIBS
CPPFLAGS="$CPPFLAGS $ZLIB_INCLUDES"
LIBS="$ZLIB_LIBS $LIBS"
+
{ $as_echo "$as_me:$LINENO: checking for zlibVersion" >&5
$as_echo_n "checking for zlibVersion... " >&6; }
if test "${ac_cv_func_zlibVersion+set}" = set; then
@@ -5236,8 +5237,9 @@ $as_echo "$as_me: error: zlib not found" >&2;}
fi
-CPPFLAGS=$save_CPPFLAGS
-LIBS=$save_LIBS
+CPPFLAGS=$kpse_save_CPPFLAGS
+LIBS=$kpse_save_LIBS
+
fi
diff --git a/Build/source/libs/libpng/configure.ac b/Build/source/libs/libpng/configure.ac
index 62fa5f666bc..c4b0f2ac225 100644
--- a/Build/source/libs/libpng/configure.ac
+++ b/Build/source/libs/libpng/configure.ac
@@ -53,16 +53,11 @@ AM_CONDITIONAL([build], [test "x$enable_build" != xno])
# don't run any tests for '--disable-build', there may be no zlib.
if test "x$enable_build" != xno; then
-save_CPPFLAGS=$CPPFLAGS
-save_LIBS=$LIBS
-
-CPPFLAGS="$CPPFLAGS $ZLIB_INCLUDES"
-LIBS="$ZLIB_LIBS $LIBS"
+KPSE_ADD_FLAGS([zlib])
AC_CHECK_FUNC([zlibVersion], , [AC_ERROR([zlib not found])])
-CPPFLAGS=$save_CPPFLAGS
-LIBS=$save_LIBS
+KPSE_RESTORE_FLAGS
fi