summaryrefslogtreecommitdiff
path: root/Build/source/utils
diff options
context:
space:
mode:
authorPeter Breitenlohner <peb@mppmu.mpg.de>2011-01-11 17:34:27 +0000
committerPeter Breitenlohner <peb@mppmu.mpg.de>2011-01-11 17:34:27 +0000
commitcccf458bc431d5acf57051e42292f42ea20ebb7e (patch)
treee029956c061897544f69d9baad97338ce7849d23 /Build/source/utils
parentb66972550a98f8260ff627d68e9b120ab3e960d1 (diff)
build system: use pkg-config to detect installed libpng
git-svn-id: svn://tug.org/texlive/trunk@21029 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/utils')
-rwxr-xr-xBuild/source/utils/configure19
1 files changed, 2 insertions, 17 deletions
diff --git a/Build/source/utils/configure b/Build/source/utils/configure
index c8cc0719bf4..ceae900cd6d 100755
--- a/Build/source/utils/configure
+++ b/Build/source/utils/configure
@@ -783,8 +783,6 @@ with_system_t1lib
with_t1lib_includes
with_t1lib_libdir
with_system_libpng
-with_libpng_includes
-with_libpng_libdir
with_system_zlib
with_zlib_includes
with_zlib_libdir
@@ -1601,11 +1599,8 @@ Optional Packages:
--with-t1lib-includes=DIR
t1lib headers installed in DIR
--with-t1lib-libdir=DIR t1lib library installed in DIR
- --with-system-libpng use installed libpng headers and library
- --with-libpng-includes=DIR
- libpng headers installed in DIR
- --with-libpng-libdir=DIR
- libpng library installed in DIR
+ --with-system-libpng use installed libpng headers and library (requires
+ pkg-config)
--with-system-zlib use installed zlib headers and library
--with-zlib-includes=DIR
zlib headers installed in DIR
@@ -4782,16 +4777,6 @@ fi
if test "${with_system_libpng+set}" = set; then :
withval=$with_system_libpng;
fi
-
-# Check whether --with-libpng-includes was given.
-if test "${with_libpng_includes+set}" = set; then :
- withval=$with_libpng_includes;
-fi
-
-# Check whether --with-libpng-libdir was given.
-if test "${with_libpng_libdir+set}" = set; then :
- withval=$with_libpng_libdir;
-fi
if test "x$with_system_libpng" = x; then
if test -f $srcdir/../libs/libpng/configure; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: Assuming \`libpng' headers and library from TL tree" >&5