update build system

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

2 files changed, 24 insertions, 21 deletions

diff --git a/Build/source/texk/xdvik/configure b/Build/source/texk/xdvik/configure
index 5bd78dbf029..a4c4f171094 100755
--- a/Build/source/texk/xdvik/configure
+++ b/Build/source/texk/xdvik/configure
@@ -12931,9 +12931,11 @@ case $with_xdvi_x_toolkit in
   "" | x | xa | xaw) val=xaw ;;
   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
-$as_echo "$as_me: WARNING: unknown --with-xdvi-x-toolkit argument \`$with_xdvi_x_toolkit'; using xaw." >&2;}
-         val=xaw ;;
+  *) { $as_echo "$as_me:$LINENO: WARNING: unknown --with-xdvi-x-toolkit argument
+                                                     \`$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;}
+                                        val=xaw ;;
 esac
 
 with_xdvi_x_toolkit=$val
@@ -12951,7 +12953,7 @@ 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;}
-         PS_DEF=-DPS_GS ;;
+                          PS_DEF=-DPS_GS ;;
 esac
 
 
@@ -16011,11 +16013,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:16014: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:16016: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:16018: \$? = $ac_status" >&5
+   echo "$as_me:16020: \$? = $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.
@@ -16110,11 +16112,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:16113: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:16115: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:16117: \$? = $ac_status" >&5
+   echo "$as_me:16119: \$? = $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
@@ -16162,11 +16164,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:16165: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:16167: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:16169: \$? = $ac_status" >&5
+   echo "$as_me:16171: \$? = $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
diff --git a/Build/source/texk/xdvik/configure.ac b/Build/source/texk/xdvik/configure.ac
index c7a6b5a06df..f6e066a947b 100644
--- a/Build/source/texk/xdvik/configure.ac
+++ b/Build/source/texk/xdvik/configure.ac
@@ -18,13 +18,14 @@ KPSE_COMMON([xdvik])
 
 m4_include([ac/xdvik.ac])
 AS_CASE([$with_xdvi_x_toolkit],
-        [next | nextaw | neXtaw], [val=neXtaw],
-        [xaw3d], [val=xaw3d],
-        ["" | x | xa | xaw], [val=xaw],
-        [y | ye | yes], [val=yes],
+        [next | nextaw | neXtaw],      [val=neXtaw],
+        [xaw3d],                       [val=xaw3d],
+        ["" | 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.])
-         val=xaw])
+                                       [AC_MSG_WARN([unknown --with-xdvi-x-toolkit argument 
+                                                     `$with_xdvi_x_toolkit'; using xaw.])
+                                        val=xaw])
 with_xdvi_x_toolkit=$val
 
 AC_ARG_WITH([ps],
@@ -32,11 +33,11 @@ AC_ARG_WITH([ps],
                            [Use PostScript (PS=no/yes/gs/dps/news, default gs)]))
 AS_CASE([$with_ps],
         ["" | yes | gs], [PS_DEF=-DPS_GS],
-        [no], [PS_DEF=],
-        [dps], [PS_DEF=-DPS_DPS],
-        [news], [PS_DEF=-DPS_NEWS],
-        [AC_MSG_WARN([unknown--with-ps argument `$with_ps'; using gs.])
-         PS_DEF=-DPS_GS])
+        [no],            [PS_DEF=],
+        [dps],           [PS_DEF=-DPS_DPS],
+        [news],          [PS_DEF=-DPS_NEWS],
+                         [AC_MSG_WARN([unknown--with-ps argument `$with_ps'; using gs.])
+                          PS_DEF=-DPS_GS])
 AC_SUBST([PS_DEF])
 
 dnl Required, not optional.