update build system

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

2 files changed, 41 insertions, 19 deletions

diff --git a/Build/source/texk/xdvik/configure b/Build/source/texk/xdvik/configure
index 439eaf9a1d0..2a1e0c0b73b 100755
--- a/Build/source/texk/xdvik/configure
+++ b/Build/source/texk/xdvik/configure
@@ -940,6 +940,7 @@ enable_largefile
 enable_compiler_warnings
 with_xdvi_x_toolkit
 with_ps
+enable_missing
 enable_a4
 with_x
 with_iconv_include
@@ -1617,6 +1618,8 @@ Optional Features:
   --enable-compiler-warnings=[no|min|yes|max]
                           Turn on compiler warnings [default: yes if
                           maintainer-mode, min otherwise]
+  --disable-missing       terminate if a requested program or feature must be
+                          disabled, e.g., due to missing libraries
   --disable-a4            Set default paper size to letter and default unit to
                           inch
   --enable-magick         Use ImageMagick to load/render image files.
@@ -4402,13 +4405,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:4405: $ac_compile\"" >&5)
+  (eval echo "\"\$as_me:4408: $ac_compile\"" >&5)
   (eval "$ac_compile" 2>conftest.err)
   cat conftest.err >&5
-  (eval echo "\"\$as_me:4408: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
+  (eval echo "\"\$as_me:4411: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
   (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
   cat conftest.err >&5
-  (eval echo "\"\$as_me:4411: output\"" >&5)
+  (eval echo "\"\$as_me:4414: output\"" >&5)
   cat conftest.out >&5
   if $GREP 'External.*some_variable' conftest.out > /dev/null; then
     lt_cv_nm_interface="MS dumpbin"
@@ -5614,7 +5617,7 @@ ia64-*-hpux*)
   ;;
 *-*-irix6*)
   # Find out which ABI we are using.
-  echo '#line 5617 "configure"' > conftest.$ac_ext
+  echo '#line 5620 "configure"' > conftest.$ac_ext
   if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
@@ -7575,11 +7578,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:7578: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:7581: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:7582: \$? = $ac_status" >&5
+   echo "$as_me:7585: \$? = $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.
@@ -7914,11 +7917,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:7917: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:7920: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:7921: \$? = $ac_status" >&5
+   echo "$as_me:7924: \$? = $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.
@@ -8019,11 +8022,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:8022: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:8025: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:8026: \$? = $ac_status" >&5
+   echo "$as_me:8029: \$? = $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
@@ -8074,11 +8077,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:8077: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:8080: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:8081: \$? = $ac_status" >&5
+   echo "$as_me:8084: \$? = $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
@@ -10874,7 +10877,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 10877 "configure"
+#line 10880 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -10970,7 +10973,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 10973 "configure"
+#line 10976 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -13115,6 +13118,11 @@ if test "${with_ps+set}" = set; then
   withval=$with_ps;
 fi
 
+# Check whether --enable-missing was given.
+if test "${enable_missing+set}" = set; then
+  enableval=$enable_missing;
+fi
+
 case $with_ps in
   "" | yes | gs) PS_DEF=-DPS_GS ;;
   no) PS_DEF= ;;
@@ -13122,6 +13130,13 @@ case $with_ps in
   news) PS_DEF=-DPS_NEWS ;;
   *) { $as_echo "$as_me:$LINENO: WARNING: unknown--with-ps argument \`$with_ps'; using gs." >&5
 $as_echo "$as_me: WARNING: unknown--with-ps argument \`$with_ps'; using gs." >&2;}
+if test "x$enable_missing" = xno; then
+  { { $as_echo "$as_me:$LINENO: error: terminating." >&5
+$as_echo "$as_me: error: terminating." >&2;}
+   { (exit 1); exit 1; }; }
+fi
+
+
                           PS_DEF=-DPS_GS ;;
 esac
 
@@ -20758,9 +20773,16 @@ case $with_xdvi_x_toolkit in
   y | ye | yes) val=yes ;;
   m | mo | mot | moti | motif) val=motif ;;
   *) { $as_echo "$as_me:$LINENO: WARNING: unknown --with-xdvi-x-toolkit argument
-                                                     \`$with_xdvi_x_toolkit'; using xaw." >&5
+                                                       \`$with_xdvi_x_toolkit'; using xaw." >&5
 $as_echo "$as_me: WARNING: unknown --with-xdvi-x-toolkit argument
-                                                     \`$with_xdvi_x_toolkit'; using xaw." >&2;}
+                                                       \`$with_xdvi_x_toolkit'; using xaw." >&2;}
+if test "x$enable_missing" = xno; then
+  { { $as_echo "$as_me:$LINENO: error: terminating." >&5
+$as_echo "$as_me: error: terminating." >&2;}
+   { (exit 1); exit 1; }; }
+fi
+
+
                                         val=xaw ;;
 esac
 
diff --git a/Build/source/texk/xdvik/configure.ac b/Build/source/texk/xdvik/configure.ac
index a00f2320ef3..5fea1bfcf8c 100644
--- a/Build/source/texk/xdvik/configure.ac
+++ b/Build/source/texk/xdvik/configure.ac
@@ -29,7 +29,7 @@ AS_CASE([$with_ps],
         [no],            [PS_DEF=],
         [dps],           [PS_DEF=-DPS_DPS],
         [news],          [PS_DEF=-DPS_NEWS],
-                         [AC_MSG_WARN([unknown--with-ps argument `$with_ps'; using gs.])
+                         [KPSE_MSG_WARN([unknown--with-ps argument `$with_ps'; using gs.])
                           PS_DEF=-DPS_GS])
 AC_SUBST([PS_DEF])
 
@@ -200,8 +200,8 @@ AS_CASE([$with_xdvi_x_toolkit],
         ["" | x | xa | xaw],           [val=xaw],
         [y | ye | yes],                [val=yes],
         [m | mo | mot | moti | motif], [val=motif],
-                                       [AC_MSG_WARN([unknown --with-xdvi-x-toolkit argument 
-                                                     `$with_xdvi_x_toolkit'; using xaw.])
+                                       [KPSE_MSG_WARN([unknown --with-xdvi-x-toolkit argument 
+                                                       `$with_xdvi_x_toolkit'; using xaw.])
                                         val=xaw])
 with_xdvi_x_toolkit=$val