Build system: Reorganize flags for system (installed) libraries

git-svn-id: svn://tug.org/texlive/trunk@36495 c570f23f-e606-0410-a88d-b1316a301751

2 files changed, 5 insertions, 35 deletions

diff --git a/Build/source/libs/cairo/configure b/Build/source/libs/cairo/configure
index 1ff3c6488eb..d369678526c 100755
--- a/Build/source/libs/cairo/configure
+++ b/Build/source/libs/cairo/configure
@@ -6580,7 +6580,7 @@ if test "x$with_system_pixman" = xyes; then
   PIXMAN_INCLUDES=`$PKG_CONFIG pixman-1 --cflags`
   PIXMAN_LIBS=`$PKG_CONFIG pixman-1 --libs`
 elif test "x$need_pixman:$with_system_pixman" = xyes:yes; then
-  as_fn_error $? "did not find pixman-0.18 or better" "$LINENO" 5
+  as_fn_error $? "did not find pixman-1 0.18 or better" "$LINENO" 5
 fi
 else
   PIXMAN_INCLUDES="-I$kpse_BLD/libs/pixman/include"
diff --git a/Build/source/libs/configure b/Build/source/libs/configure
index 6ccdbe8641e..1bb14c3d76b 100755
--- a/Build/source/libs/configure
+++ b/Build/source/libs/configure
@@ -834,11 +834,7 @@ with_system_zlib
 with_zlib_includes
 with_zlib_libdir
 with_system_ptexenc
-with_ptexenc_includes
-with_ptexenc_libdir
 with_system_kpathsea
-with_kpathsea_includes
-with_kpathsea_libdir
 enable_mktexmf_default
 enable_mktexpk_default
 enable_mktextfm_default
@@ -1697,16 +1693,10 @@ Optional Packages:
   --with-zlib-includes=DIR
                           zlib headers installed in DIR
   --with-zlib-libdir=DIR  zlib library installed in DIR
-  --with-system-ptexenc   use installed ptexenc headers and library
-  --with-ptexenc-includes=DIR
-                          ptexenc headers installed in DIR
-  --with-ptexenc-libdir=DIR
-                          ptexenc library installed in DIR
-  --with-system-kpathsea  use installed kpathsea headers and library
-  --with-kpathsea-includes=DIR
-                          kpathsea headers installed in DIR
-  --with-kpathsea-libdir=DIR
-                          kpathsea library installed in DIR
+  --with-system-ptexenc   use installed ptexenc headers and library (requires
+                          pkg-config)
+  --with-system-kpathsea  use installed kpathsea headers and library (requires
+                          pkg-config)
 
 Some influential environment variables:
   CC          C compiler command
@@ -5368,16 +5358,6 @@ fi
 if test "${with_system_ptexenc+set}" = set; then :
   withval=$with_system_ptexenc;
 fi
-
-# Check whether --with-ptexenc-includes was given.
-if test "${with_ptexenc_includes+set}" = set; then :
-  withval=$with_ptexenc_includes;
-fi
-
-# Check whether --with-ptexenc-libdir was given.
-if test "${with_ptexenc_libdir+set}" = set; then :
-  withval=$with_ptexenc_libdir;
-fi
 if test "x$with_system_ptexenc" = x; then
   if test -f $srcdir/../texk/ptexenc/configure; then
     { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming \`ptexenc' headers and library from TL tree" >&5
@@ -5412,16 +5392,6 @@ test "x$need_ptexenc" = xyes && {
 if test "${with_system_kpathsea+set}" = set; then :
   withval=$with_system_kpathsea;
 fi
-
-# Check whether --with-kpathsea-includes was given.
-if test "${with_kpathsea_includes+set}" = set; then :
-  withval=$with_kpathsea_includes;
-fi
-
-# Check whether --with-kpathsea-libdir was given.
-if test "${with_kpathsea_libdir+set}" = set; then :
-  withval=$with_kpathsea_libdir;
-fi
 if test "x$with_system_kpathsea" = x; then
   if test -f $srcdir/../texk/kpathsea/configure; then
     { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming \`kpathsea' headers and library from TL tree" >&5