build system cleanup

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

2 files changed, 35 insertions, 42 deletions

diff --git a/Build/source/texk/web2c/ac/withenable.ac b/Build/source/texk/web2c/ac/withenable.ac
index 42d9c3f6e99..42e6b71eedc 100644
--- a/Build/source/texk/web2c/ac/withenable.ac
+++ b/Build/source/texk/web2c/ac/withenable.ac
@@ -4,5 +4,5 @@ dnl Copyright (C) 2009 Peter Breitenlohner <tex-live@tug.org>
 dnl You may freely use, modify and/or distribute this file.
 dnl
 ## configure options and TL libraries required for web2c
-KPSE_WITH_PROG([web2c], [kpathsea zlib], , [TeX & Co.])
+KPSE_ENABLE_PROG([web2c], [kpathsea zlib], , [TeX & Co.])
 m4_include(kpse_TL[texk/web2c/ac/web2c.ac])
diff --git a/Build/source/texk/web2c/configure b/Build/source/texk/web2c/configure
index c4ee2195f78..e69855d8a81 100755
--- a/Build/source/texk/web2c/configure
+++ b/Build/source/texk/web2c/configure
@@ -1070,8 +1070,6 @@ with_system_graphite
 with_graphite_includes
 with_graphite_libdir
 with_system_freetype2
-with_freetype2_includes
-with_freetype2_libdir
 with_system_teckit
 with_teckit_includes
 with_teckit_libdir
@@ -1790,10 +1788,7 @@ Optional Packages:
   --with-graphite-libdir=DIR
                           graphite library installed in DIR
   --with-system-freetype2 use installed freetype2 headers and library
-  --with-freetype2-includes=DIR
-                          freetype2 headers installed in DIR
-  --with-freetype2-libdir=DIR
-                          freetype2 library installed in DIR
+                          (requires freetype-config)
   --with-system-teckit    use installed teckit headers and library
   --with-teckit-includes=DIR
                           teckit headers installed in DIR
@@ -4407,13 +4402,13 @@ if test "${lt_cv_nm_interface+set}" = set; then
 else
   lt_cv_nm_interface="BSD nm"
   echo "int some_variable = 0;" > conftest.$ac_ext
-  (eval echo "\"\$as_me:4410: $ac_compile\"" >&5)
+  (eval echo "\"\$as_me:4405: $ac_compile\"" >&5)
   (eval "$ac_compile" 2>conftest.err)
   cat conftest.err >&5
-  (eval echo "\"\$as_me:4413: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
+  (eval echo "\"\$as_me:4408: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
   (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
   cat conftest.err >&5
-  (eval echo "\"\$as_me:4416: output\"" >&5)
+  (eval echo "\"\$as_me:4411: output\"" >&5)
   cat conftest.out >&5
   if $GREP 'External.*some_variable' conftest.out > /dev/null; then
     lt_cv_nm_interface="MS dumpbin"
@@ -5619,7 +5614,7 @@ ia64-*-hpux*)
   ;;
 *-*-irix6*)
   # Find out which ABI we are using.
-  echo '#line 5622 "configure"' > conftest.$ac_ext
+  echo '#line 5617 "configure"' > conftest.$ac_ext
   if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
@@ -7666,11 +7661,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:7669: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:7664: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:7673: \$? = $ac_status" >&5
+   echo "$as_me:7668: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -8005,11 +8000,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:8008: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:8003: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:8012: \$? = $ac_status" >&5
+   echo "$as_me:8007: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -8110,11 +8105,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:8113: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:8108: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:8117: \$? = $ac_status" >&5
+   echo "$as_me:8112: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -8165,11 +8160,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:8168: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:8163: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:8172: \$? = $ac_status" >&5
+   echo "$as_me:8167: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -10965,7 +10960,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 10968 "configure"
+#line 10963 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -11061,7 +11056,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 11064 "configure"
+#line 11059 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -16077,11 +16072,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:16080: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:16075: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:16084: \$? = $ac_status" >&5
+   echo "$as_me:16079: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -16176,11 +16171,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:16179: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:16174: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:16183: \$? = $ac_status" >&5
+   echo "$as_me:16178: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -16228,11 +16223,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:16231: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:16226: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:16235: \$? = $ac_status" >&5
+   echo "$as_me:16230: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -23368,6 +23363,7 @@ else
     -e "s,BLD/,$kpse_BLD/,g"`
   KPATHSEA_LIBS=`echo 'BLD/texk/kpathsea/libkpathsea.la' | sed \
     -e "s,BLD/,$kpse_BLD/,g"`
+
   KPATHSEA_DEPEND=`echo 'BLD/texk/kpathsea/libkpathsea.la' | sed \
     -e 's,BLD/texk/,${top_builddir}/../,g'`
    KPATHSEA_RULE='# Rebuild libkpathsea
@@ -23407,6 +23403,7 @@ else
     -e "s,BLD/,$kpse_BLD/,g"`
   ZLIB_LIBS=`echo 'BLD/libs/zlib/libz.a' | sed \
     -e "s,BLD/,$kpse_BLD/,g"`
+
   ZLIB_DEPEND=`echo 'BLD/libs/zlib/libz.a' | sed \
     -e 's,BLD/,${top_builddir}/../../,g'`
    ZLIB_RULE='# Rebuild libz
@@ -23446,6 +23443,7 @@ else
     -e "s,BLD/,$kpse_BLD/,g"`
   LIBPNG_LIBS=`echo 'BLD/libs/libpng/libpng.a' | sed \
     -e "s,BLD/,$kpse_BLD/,g"`
+
   LIBPNG_DEPEND=`echo 'BLD/libs/libpng/libpng.a' | sed \
     -e 's,BLD/,${top_builddir}/../../,g'`
    LIBPNG_RULE='# Rebuild libpng
@@ -23461,6 +23459,7 @@ fi
     -e "s,BLD/,$kpse_BLD/,g"`
   XPDF_LIBS=`echo 'BLD/libs/xpdf/libxpdf.a' | sed \
     -e "s,BLD/,$kpse_BLD/,g"`
+
   XPDF_DEPEND=`echo 'BLD/libs/xpdf/libxpdf.a' | sed \
     -e 's,BLD/,${top_builddir}/../../,g'`
    XPDF_RULE='# Rebuild libxpdf
@@ -23499,6 +23498,7 @@ else
     -e "s,BLD/,$kpse_BLD/,g"`
   GRAPHITE_LIBS=`echo 'BLD/libs/graphite/libgraphite.a' | sed \
     -e "s,BLD/,$kpse_BLD/,g"`
+
   GRAPHITE_DEPEND=`echo 'BLD/libs/graphite/libgraphite.a' | sed \
     -e 's,BLD/,${top_builddir}/../../,g'`
    GRAPHITE_RULE='# Rebuild libgraphite
@@ -23604,16 +23604,6 @@ fi
 if test "${with_system_freetype2+set}" = set; then
   withval=$with_system_freetype2;
 fi
-
-# Check whether --with-freetype2-includes was given.
-if test "${with_freetype2_includes+set}" = set; then
-  withval=$with_freetype2_includes;
-fi
-
-# Check whether --with-freetype2-libdir was given.
-if test "${with_freetype2_libdir+set}" = set; then
-  withval=$with_freetype2_libdir;
-fi
 if test "x$with_system_freetype2" = xyes; then
   if test -n `$FT2_CONFIG --ftversion 2>/dev/null`; then
   FREETYPE2_INCLUDES=`$FT2_CONFIG --cflags`
@@ -23624,11 +23614,13 @@ $as_echo "$as_me: error: Can not use installed freetype2 headers and library" >&
    { (exit 1); exit 1; }; }
 fi
 else
-  FREETYPE2_INCLUDES=`echo 'cat BLD/libs/freetype2/ft-' | sed \
+  FREETYPE2_INCLUDES=`echo 'BLD/libs/freetype2' | sed \
     -e "s,SRC/,$kpse_SRC/,g" \
     -e "s,BLD/,$kpse_BLD/,g"`
   FREETYPE2_LIBS=`echo 'BLD/libs/freetype2/libfreetype.a' | sed \
     -e "s,BLD/,$kpse_BLD/,g"`
+  FREETYPE2_LIBS=`cat $FREETYPE2_INCLUDES/ft-libs`
+  FREETYPE2_INCLUDES=`cat $FREETYPE2_INCLUDES/ft-includes`
   FREETYPE2_DEPEND=`echo 'BLD/libs/freetype2/libfreetype.a' | sed \
     -e 's,BLD/,${top_builddir}/../../,g'`
    FREETYPE2_RULE='# Rebuild libfreetype
@@ -23637,10 +23629,6 @@ $(FREETYPE2_DEPEND): ${top_builddir}/../../libs/freetype2/ft2build.h
 ${top_builddir}/../../libs/freetype2/ft2build.h:
 	cd ${top_builddir}/../../libs/freetype2 && $(MAKE) $(AM_MAKEFLAGS)'
 fi
-if test "x$with_system_freetype2" = xno; then
-  FREETYPE2_LIBS='`'"$FREETYPE2_INCLUDES"'libs`'
-  FREETYPE2_INCLUDES='`'"$FREETYPE2_INCLUDES"'includes`'
-fi
 
 ## _KPSE_LIB_FLAGS: Setup teckit (-lTECkit) flags
 
@@ -23672,6 +23660,7 @@ else
     -e "s,BLD/,$kpse_BLD/,g"`
   TECKIT_LIBS=`echo 'BLD/libs/teckit/libTECkit.a' | sed \
     -e "s,BLD/,$kpse_BLD/,g"`
+
   TECKIT_DEPEND=`echo 'BLD/libs/teckit/libTECkit.a' | sed \
     -e 's,BLD/,${top_builddir}/../../,g'`
    TECKIT_RULE='# Rebuild libTECkit
@@ -23685,6 +23674,7 @@ fi
     -e "s,BLD/,$kpse_BLD/,g"`
   ICU_LIBS=`echo 'BLD/libs/icu/icu-build/lib/libsicuuc.a BLD/libs/icu/icu-build/lib/libsicule.a BLD/libs/icu/icu-build/lib/libsicudata.a' | sed \
     -e "s,BLD/,$kpse_BLD/,g"`
+
   ICU_DEPEND=`echo 'BLD/libs/icu/icu-build/lib/libsicuuc.a BLD/libs/icu/icu-build/lib/libsicule.a BLD/libs/icu/icu-build/lib/libsicudata.a' | sed \
     -e 's,BLD/,${top_builddir}/../../,g'`
    ICU_RULE='# Rebuild libsicuxxx
@@ -23699,10 +23689,13 @@ ${top_builddir}/../../libs/icu/icu-build/common/unicode/platform.h:
     -e "s,BLD/,$kpse_BLD/,g"`
   OBSDCOMPAT_LIBS=`echo 'BLD/libs/obsdcompat/libopenbsd-compat.a' | sed \
     -e "s,BLD/,$kpse_BLD/,g"`
+
   OBSDCOMPAT_DEPEND=`echo 'BLD/libs/obsdcompat/libopenbsd-compat.a' | sed \
     -e 's,BLD/,${top_builddir}/../../,g'`
    OBSDCOMPAT_RULE='# Rebuild libopenbsd-compat
 $(OBSDCOMPAT_DEPEND): ${top_srcdir}/../../libs/obsdcompat/*.[ch]
+	cd ${top_builddir}/../../libs/obsdcompat && $(MAKE) $(AM_MAKEFLAGS)
+${top_srcdir}/../../libs/obsdcompat/*.[ch]:
 	cd ${top_builddir}/../../libs/obsdcompat && $(MAKE) $(AM_MAKEFLAGS)'