handling of texlua, texluac, and dvitomp symlinks

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

8 files changed, 186 insertions, 153 deletions

diff --git a/Build/source/texk/web2c/Makefile.in b/Build/source/texk/web2c/Makefile.in
index f23d5502e79..6ee32a2dad9 100644
--- a/Build/source/texk/web2c/Makefile.in
+++ b/Build/source/texk/web2c/Makefile.in
@@ -8041,12 +8041,13 @@ ps: ps-recursive
 ps-am:
 
 uninstall-am: uninstall-binPROGRAMS uninstall-man
-
+	@$(NORMAL_INSTALL)
+	$(MAKE) $(AM_MAKEFLAGS) uninstall-hook
 uninstall-man: uninstall-man1 uninstall-man5
 
 .MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) all check-am \
 	ctags-recursive install-am install-exec-am install-strip \
-	tags-recursive
+	tags-recursive uninstall-am
 
 .PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
 	all all-am am--refresh check check-TESTS check-am clean \
@@ -8067,8 +8068,8 @@ uninstall-man: uninstall-man1 uninstall-man5
 	maintainer-clean-generic mostlyclean mostlyclean-compile \
 	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
 	tags tags-recursive uninstall uninstall-am \
-	uninstall-binPROGRAMS uninstall-man uninstall-man1 \
-	uninstall-man5
+	uninstall-binPROGRAMS uninstall-hook uninstall-man \
+	uninstall-man1 uninstall-man5
 
 
 # in case of an SVN repository
@@ -8385,11 +8386,6 @@ mp-pool.c: mp.pool $(makecpool_stamp) mpdir/mplib.h
 # We must create mpd.h before building the liboldmpost_a_OBJECTS.
 $(liboldmpost_a_OBJECTS): mpd.h
 
-# Double-colon rule since we do something similar in luatexdir (maybe others).
-install-exec-hook::
-	cd $(DESTDIR)$(bindir) && rm -f dvitomp$(EXEEXT) \
-	  && ln -s mpost$(EXEEXT) dvitomp$(EXEEXT)
-
 mpost.c: ctangle$(EXEEXT) mplibdir/mpost.w
 	$(mp_ctangle) mpost.w
 
@@ -8401,6 +8397,13 @@ mpxout-ctangle: ctangle$(EXEEXT) mplibdir/mpxout.w
 
 $(mpost_OBJECTS): $(nodist_mpost_SOURCES) libmplib.a
 
+# Double-colon rule since we do something similar in luatexdir (maybe others).
+install-exec-hook::
+	cd $(DESTDIR)$(bindir) && rm -f dvitomp$(EXEEXT) \
+	  && $(LN_S) mpost$(EXEEXT) dvitomp$(EXEEXT)
+uninstall-hook::
+	rm -f $(DESTDIR)$(bindir)/dvitomp$(EXEEXT)
+
 .PHONY: mptrap-clean
 clean-local:: mptrap-clean
 mptrap-clean:
@@ -8543,12 +8546,15 @@ luatexdir/luatexextra.h: luatexdir/luatexextra.in luatexdir/luatex.version
 	sed -e s/LUATEX-VERSION/`cat luatexdir/luatex.version`/ \
 	  $(srcdir)/luatexdir/luatexextra.in >$@
 
-# Double-colon rule since we do something similar in mpdir (maybe others).
+# Double-colon rule since we do something similar in mplibdir (maybe others).
 install-exec-hook::
 	cd $(DESTDIR)$(bindir) && rm -f texlua$(EXEEXT) \
-	  && ln -s luatex$(EXEEXT) texlua$(EXEEXT)
+	  && $(LN_S) luatex$(EXEEXT) texlua$(EXEEXT)
 	cd $(DESTDIR)$(bindir) && rm -f texluac$(EXEEXT) \
-	  && ln -s luatex$(EXEEXT) texluac$(EXEEXT)
+	  && $(LN_S) luatex$(EXEEXT) texluac$(EXEEXT)
+uninstall-hook::
+	rm -f $(DESTDIR)$(bindir)/texlua$(EXEEXT)
+	rm -f $(DESTDIR)$(bindir)/texluac$(EXEEXT)
 luatangle.c luatangle.h: luatangle-web2c
 luatangle-web2c: $(web2c_depend) luatangle.p
 	$(web2c) luatangle
diff --git a/Build/source/texk/web2c/configure b/Build/source/texk/web2c/configure
index ff349e89a5f..3a3026d240b 100755
--- a/Build/source/texk/web2c/configure
+++ b/Build/source/texk/web2c/configure
@@ -824,7 +824,6 @@ XPDF_RULE
 XPDF_DEPEND
 XPDF_LIBS
 XPDF_INCLUDES
-PKG_CONFIG
 LIBPNG_RULE
 LIBPNG_DEPEND
 LIBPNG_LIBS
@@ -895,6 +894,7 @@ XETEX_MACOSX_FALSE
 XETEX_MACOSX_TRUE
 FONTCONFIG_LIBS
 FONTCONFIG_INCLUDES
+PKG_CONFIG
 ipc_socketlibs
 lua_socketlibs
 MINGW32_FALSE
@@ -1056,7 +1056,8 @@ enable_tektronixwin
 enable_unitermwin
 enable_mp
 enable_web_progs
-with_fontconfig
+with_fontconfig_includes
+with_fontconfig_libdir
 with_x
 with_system_kpathsea
 with_kpathsea_includes
@@ -1767,7 +1768,10 @@ Optional Packages:
   --with-gnu-ld           assume the C compiler uses GNU ld [default=no]
   --with-editor=CMD       invoke CMD from the `e' option [vi +%d %s]
   --without-mf-x-toolkit  do not use X toolkit for METAFONT
-  --with-fontconfig=DIR   use fontconfig include/library files from DIR
+  --with-fontconfig-includes=DIR
+                          fontconfig headers installed in DIR
+  --with-fontconfig-libdir=DIR
+                          fontconfig library installed in DIR
   --with-x                use the X Window System
   --with-system-kpathsea  use installed kpathsea headers and library
   --with-kpathsea-includes=DIR
@@ -4557,13 +4561,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:4560: $ac_compile\"" >&5)
+  (eval echo "\"\$as_me:4564: $ac_compile\"" >&5)
   (eval "$ac_compile" 2>conftest.err)
   cat conftest.err >&5
-  (eval echo "\"\$as_me:4563: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
+  (eval echo "\"\$as_me:4567: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
   (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
   cat conftest.err >&5
-  (eval echo "\"\$as_me:4566: output\"" >&5)
+  (eval echo "\"\$as_me:4570: output\"" >&5)
   cat conftest.out >&5
   if $GREP 'External.*some_variable' conftest.out > /dev/null; then
     lt_cv_nm_interface="MS dumpbin"
@@ -5769,7 +5773,7 @@ ia64-*-hpux*)
   ;;
 *-*-irix6*)
   # Find out which ABI we are using.
-  echo '#line 5772 "configure"' > conftest.$ac_ext
+  echo '#line 5776 "configure"' > conftest.$ac_ext
   if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
@@ -7715,11 +7719,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:7718: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:7722: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:7722: \$? = $ac_status" >&5
+   echo "$as_me:7726: \$? = $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.
@@ -8054,11 +8058,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:8057: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:8061: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:8061: \$? = $ac_status" >&5
+   echo "$as_me:8065: \$? = $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.
@@ -8159,11 +8163,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:8162: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:8166: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:8166: \$? = $ac_status" >&5
+   echo "$as_me:8170: \$? = $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
@@ -8214,11 +8218,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:8217: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:8221: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:8221: \$? = $ac_status" >&5
+   echo "$as_me:8225: \$? = $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
@@ -11014,7 +11018,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 11017 "configure"
+#line 11021 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -11110,7 +11114,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 11113 "configure"
+#line 11117 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -16164,11 +16168,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:16167: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:16171: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:16171: \$? = $ac_status" >&5
+   echo "$as_me:16175: \$? = $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.
@@ -16263,11 +16267,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:16266: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:16270: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:16270: \$? = $ac_status" >&5
+   echo "$as_me:16274: \$? = $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
@@ -16315,11 +16319,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:16318: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:16322: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:16322: \$? = $ac_status" >&5
+   echo "$as_me:16326: \$? = $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
@@ -18533,11 +18537,107 @@ _ACEOF
 
 fi
 
-if test "x$kpse_cv_have_Carbon" = xno; then
+if test -n "$ac_tool_prefix"; then
+  # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args.
+set dummy ${ac_tool_prefix}pkg-config; ac_word=$2
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_PKG_CONFIG+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$PKG_CONFIG"; then
+  ac_cv_prog_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_PKG_CONFIG="${ac_tool_prefix}pkg-config"
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+done
+IFS=$as_save_IFS
+
+fi
+fi
+PKG_CONFIG=$ac_cv_prog_PKG_CONFIG
+if test -n "$PKG_CONFIG"; then
+  { $as_echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
+$as_echo "$PKG_CONFIG" >&6; }
+else
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+fi
+if test -z "$ac_cv_prog_PKG_CONFIG"; then
+  ac_ct_PKG_CONFIG=$PKG_CONFIG
+  # Extract the first word of "pkg-config", so it can be a program name with args.
+set dummy pkg-config; ac_word=$2
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_ac_ct_PKG_CONFIG+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$ac_ct_PKG_CONFIG"; then
+  ac_cv_prog_ac_ct_PKG_CONFIG="$ac_ct_PKG_CONFIG" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_ac_ct_PKG_CONFIG="pkg-config"
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+done
+IFS=$as_save_IFS
+
+fi
+fi
+ac_ct_PKG_CONFIG=$ac_cv_prog_ac_ct_PKG_CONFIG
+if test -n "$ac_ct_PKG_CONFIG"; then
+  { $as_echo "$as_me:$LINENO: result: $ac_ct_PKG_CONFIG" >&5
+$as_echo "$ac_ct_PKG_CONFIG" >&6; }
+else
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+  if test "x$ac_ct_PKG_CONFIG" = x; then
+    PKG_CONFIG="false"
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+    PKG_CONFIG=$ac_ct_PKG_CONFIG
+  fi
+else
+  PKG_CONFIG="$ac_cv_prog_PKG_CONFIG"
+fi
+
+
+# Check whether --with-fontconfig-includes was given.
+if test "${with_fontconfig_includes+set}" = set; then
+  withval=$with_fontconfig_includes;
+fi
 
-# Check whether --with-fontconfig was given.
-if test "${with_fontconfig+set}" = set; then
-  withval=$with_fontconfig;
+# Check whether --with-fontconfig-libdir was given.
+if test "${with_fontconfig_libdir+set}" = set; then
+  withval=$with_fontconfig_libdir;
 fi
 { $as_echo "$as_me:$LINENO: checking for installed fontconfig headers and library" >&5
 $as_echo_n "checking for installed fontconfig headers and library... " >&6; }
@@ -18546,9 +18646,16 @@ if test "${kpse_cv_have_fontconfig+set}" = set; then
 else
   kpse_save_CPPFLAGS=$CPPFLAGS
 kpse_save_LIBS=$LIBS
-if test "x$with_fontconfig" != x && test -d "$with_fontconfig"; then
-  kpse_cv_fontconfig_includes="-I$with_fontconfig/include"
-  kpse_cv_fontconfig_libs="-L$with_fontconfig/lib -lfontconfig"
+if test "x$with_fontconfig_includes:$with_fontconfig_libdir" != x:; then
+  if test "x$with_fontconfig_includes" != x; then
+    kpse_cv_fontconfig_includes="-I$with_fontconfig_includes"
+  fi
+  if test "x$with_fontconfig_libdir" != x; then
+    kpse_cv_fontconfig_libdir="-L$with_fontconfig_libdir -lfontconfig"
+  fi
+elif $PKG_CONFIG fontconfig; then
+  kpse_cv_fontconfig_includes=`$PKG_CONFIG fontconfig --cflags`
+  kpse_cv_fontconfig_libs=`$PKG_CONFIG fontconfig --libs`
 else
   kpse_cv_fontconfig_includes=
   kpse_cv_fontconfig_libs='-lfontconfig'
@@ -18619,12 +18726,10 @@ fi
 
 
 
-       if test "x$enable_xetex:$kpse_cv_have_fontconfig" = xyes:no; then
-  { $as_echo "$as_me:$LINENO: WARNING: Sorry, can not build XeTeX without fontconfig" >&5
-$as_echo "$as_me: WARNING: Sorry, can not build XeTeX without fontconfig" >&2;}
-              enable_xetex=no
-fi
-
+if test "x$enable_xetex:$kpse_cv_have_Carbon:$kpse_cv_have_fontconfig" = xyes:no:no; then
+  { $as_echo "$as_me:$LINENO: WARNING: Sorry, can not build XeTeX without Carbon framework or fontconfig" >&5
+$as_echo "$as_me: WARNING: Sorry, can not build XeTeX without Carbon framework or fontconfig" >&2;}
+       enable_xetex=no
 fi
 
  if test "x$kpse_cv_have_Carbon" = xyes; then
@@ -23888,98 +23993,6 @@ ${top_builddir}/../../libs/libpng/png.h ${top_builddir}/../../libs/libpng/pngcon
 	cd ${top_builddir}/../../libs/libpng && $(MAKE) $(AM_MAKEFLAGS)'
 fi
 
-if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args.
-set dummy ${ac_tool_prefix}pkg-config; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_PKG_CONFIG+set}" = set; then
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$PKG_CONFIG"; then
-  ac_cv_prog_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_PKG_CONFIG="${ac_tool_prefix}pkg-config"
-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-IFS=$as_save_IFS
-
-fi
-fi
-PKG_CONFIG=$ac_cv_prog_PKG_CONFIG
-if test -n "$PKG_CONFIG"; then
-  { $as_echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
-$as_echo "$PKG_CONFIG" >&6; }
-else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-fi
-if test -z "$ac_cv_prog_PKG_CONFIG"; then
-  ac_ct_PKG_CONFIG=$PKG_CONFIG
-  # Extract the first word of "pkg-config", so it can be a program name with args.
-set dummy pkg-config; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_ac_ct_PKG_CONFIG+set}" = set; then
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$ac_ct_PKG_CONFIG"; then
-  ac_cv_prog_ac_ct_PKG_CONFIG="$ac_ct_PKG_CONFIG" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_ac_ct_PKG_CONFIG="pkg-config"
-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-IFS=$as_save_IFS
-
-fi
-fi
-ac_ct_PKG_CONFIG=$ac_cv_prog_ac_ct_PKG_CONFIG
-if test -n "$ac_ct_PKG_CONFIG"; then
-  { $as_echo "$as_me:$LINENO: result: $ac_ct_PKG_CONFIG" >&5
-$as_echo "$ac_ct_PKG_CONFIG" >&6; }
-else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-  if test "x$ac_ct_PKG_CONFIG" = x; then
-    PKG_CONFIG="false"
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-ac_tool_warned=yes ;;
-esac
-    PKG_CONFIG=$ac_ct_PKG_CONFIG
-  fi
-else
-  PKG_CONFIG="$ac_cv_prog_PKG_CONFIG"
-fi
-
 ## _KPSE_LIB_FLAGS: Setup xpdf (-lxpdf) flags
 
 # Check whether --with-system-xpdf was given.
diff --git a/Build/source/texk/web2c/configure.ac b/Build/source/texk/web2c/configure.ac
index e1e277f6f4d..c073f774413 100644
--- a/Build/source/texk/web2c/configure.ac
+++ b/Build/source/texk/web2c/configure.ac
@@ -120,11 +120,10 @@ AC_SUBST([lua_socketlibs])
 AC_SUBST([ipc_socketlibs])
 
 KPSE_CHECK_FRAMEWORK([Carbon], [ATSUStyle style])
-AS_IF([test "x$kpse_cv_have_Carbon" = xno],
-      [KPSE_FONTCONFIG_FLAGS
-       AS_IF([test "x$enable_xetex:$kpse_cv_have_fontconfig" = xyes:no],
-             [AC_MSG_WARN([Sorry, can not build XeTeX without fontconfig])
-              enable_xetex=no])])
+KPSE_FONTCONFIG_FLAGS
+AS_IF([test "x$enable_xetex:$kpse_cv_have_Carbon:$kpse_cv_have_fontconfig" = xyes:no:no],
+      [AC_MSG_WARN([Sorry, can not build XeTeX without Carbon framework or fontconfig])
+       enable_xetex=no])
 AM_CONDITIONAL([XETEX_MACOSX], [test "x$kpse_cv_have_Carbon" = xyes])
 AM_CONDITIONAL([XETEX_GRAPHITE], [test "x$with_graphite" != xno])
 
diff --git a/Build/source/texk/web2c/luatexdir/ChangeLog b/Build/source/texk/web2c/luatexdir/ChangeLog
index 74f19681a76..f22de8be119 100644
--- a/Build/source/texk/web2c/luatexdir/ChangeLog
+++ b/Build/source/texk/web2c/luatexdir/ChangeLog
@@ -1,3 +1,8 @@
+2009-05-25  Peter Breitenlohner <peb@mppmu.mpg.de>
+
+	* am/luatex.am (uninstall-hook): new target to uninstall texlua[c]
+	symlinks.
+
 2009-05-25  Karl Berry  <karl@tug.org>
 
 	* am/luatex.am (install-exec-hook): new target to install texlua[c]
diff --git a/Build/source/texk/web2c/luatexdir/am/luatex.am b/Build/source/texk/web2c/luatexdir/am/luatex.am
index 9d232bd5f1e..1ef3dfd581d 100644
--- a/Build/source/texk/web2c/luatexdir/am/luatex.am
+++ b/Build/source/texk/web2c/luatexdir/am/luatex.am
@@ -58,12 +58,15 @@ luatexdir/luatexextra.h: luatexdir/luatexextra.in luatexdir/luatex.version
 	sed -e s/LUATEX-VERSION/`cat luatexdir/luatex.version`/ \
 	  $(srcdir)/luatexdir/luatexextra.in >$@
 
-# Double-colon rule since we do something similar in mpdir (maybe others).
+# Double-colon rule since we do something similar in mplibdir (maybe others).
 install-exec-hook::
 	cd $(DESTDIR)$(bindir) && rm -f texlua$(EXEEXT) \
-	  && ln -s luatex$(EXEEXT) texlua$(EXEEXT)
+	  && $(LN_S) luatex$(EXEEXT) texlua$(EXEEXT)
 	cd $(DESTDIR)$(bindir) && rm -f texluac$(EXEEXT) \
-	  && ln -s luatex$(EXEEXT) texluac$(EXEEXT)
+	  && $(LN_S) luatex$(EXEEXT) texluac$(EXEEXT)
+uninstall-hook::
+	rm -f $(DESTDIR)$(bindir)/texlua$(EXEEXT)
+	rm -f $(DESTDIR)$(bindir)/texluac$(EXEEXT)
 
 EXTRA_DIST += $(luatex_sources) \
 	luatexdir/luatex.defines \
diff --git a/Build/source/texk/web2c/mpdir/am/mp.am b/Build/source/texk/web2c/mpdir/am/mp.am
index b940dccbe8a..b7074ef3250 100644
--- a/Build/source/texk/web2c/mpdir/am/mp.am
+++ b/Build/source/texk/web2c/mpdir/am/mp.am
@@ -54,11 +54,6 @@ liboldmpost_a_SOURCES = \
 # We must create mpd.h before building the liboldmpost_a_OBJECTS.
 $(liboldmpost_a_OBJECTS): mpd.h
 
-# Double-colon rule since we do something similar in luatexdir (maybe others).
-install-exec-hook::
-	cd $(DESTDIR)$(bindir) && rm -f dvitomp$(EXEEXT) \
-	  && ln -s mpost$(EXEEXT) dvitomp$(EXEEXT)
-
 ## Eventually delete these files
 ##
 EXTRA_DIST += \
diff --git a/Build/source/texk/web2c/mplibdir/ChangeLog b/Build/source/texk/web2c/mplibdir/ChangeLog
index e0c3e650895..ed97ac67f76 100644
--- a/Build/source/texk/web2c/mplibdir/ChangeLog
+++ b/Build/source/texk/web2c/mplibdir/ChangeLog
@@ -1,3 +1,8 @@
+2009-05-25  Peter Breitenlohner <peb@mppmu.mpg.de>
+
+	* am/.am (install-exec-hook, uninstall-hook): new targets
+	to (un)install dvitomp symlink.
+
 2009-05-13  Peter Breitenlohner  <peb@mppmu.mpg.de>
 
 	    * mptrap.test (new): Shell script for MPTRAP test.
diff --git a/Build/source/texk/web2c/mplibdir/am/mplib.am b/Build/source/texk/web2c/mplibdir/am/mplib.am
index cc5fa19e19f..891a9ef3fec 100644
--- a/Build/source/texk/web2c/mplibdir/am/mplib.am
+++ b/Build/source/texk/web2c/mplibdir/am/mplib.am
@@ -38,6 +38,13 @@ EXTRA_DIST += mplibdir/ChangeLog $(mpost_web)
 
 DISTCLEANFILES += $(nodist_mpost_SOURCES) mpxout-ctangle
 
+# Double-colon rule since we do something similar in luatexdir (maybe others).
+install-exec-hook::
+	cd $(DESTDIR)$(bindir) && rm -f dvitomp$(EXEEXT) \
+	  && $(LN_S) mpost$(EXEEXT) dvitomp$(EXEEXT)
+uninstall-hook::
+	rm -f $(DESTDIR)$(bindir)/dvitomp$(EXEEXT)
+
 ## MetaPost Tests
 ##
 mp_tests = mplibdir/mptrap.test