diff options
Diffstat (limited to 'Build/source/texk/web2c')
-rwxr-xr-x | Build/source/texk/web2c/configure | 30 |
1 files changed, 7 insertions, 23 deletions
diff --git a/Build/source/texk/web2c/configure b/Build/source/texk/web2c/configure index 14fb7d5e0b7..7ddb26275b9 100755 --- a/Build/source/texk/web2c/configure +++ b/Build/source/texk/web2c/configure @@ -927,8 +927,6 @@ with_system_zlib with_zlib_includes with_zlib_libdir with_system_libpng -with_libpng_includes -with_libpng_libdir with_system_xpdf with_system_zziplib with_system_graphite @@ -1660,11 +1658,8 @@ Optional Packages: --with-zlib-includes=DIR zlib headers installed in DIR --with-zlib-libdir=DIR zlib 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-xpdf use installed poppler headers and library instead of xpdf (requires pkg-config) --with-system-zziplib use installed zziplib headers and library (requires @@ -21981,23 +21976,12 @@ 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" = xyes; then - if test "x$with_libpng_includes" != x && test "x$with_libpng_includes" != xyes; then - LIBPNG_INCLUDES="-I$with_libpng_includes" -fi -LIBPNG_LIBS="-lpng" -if test "x$with_libpng_libdir" != x && test "x$with_libpng_libdir" != xyes; then - LIBPNG_LIBS="-L$with_libpng_libdir $LIBPNG_LIBS" + if $PKG_CONFIG libpng; then + LIBPNG_INCLUDES=`$PKG_CONFIG libpng --cflags` + LIBPNG_LIBS=`$PKG_CONFIG libpng --libs` +elif test "x$need_libpng:$with_system_libpng" = xyes:yes; then + as_fn_error $? "did not find libpng" "$LINENO" 5 fi else LIBPNG_INCLUDES=`echo '-IBLD/libs/libpng/include' | sed \ |