cleanup utils/vlna

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

1 files changed, 31 insertions, 51 deletions

diff --git a/Build/source/utils/vlna/configure b/Build/source/utils/vlna/configure
index 7b82608e0b1..fa196dd60eb 100755
--- a/Build/source/utils/vlna/configure
+++ b/Build/source/utils/vlna/configure
@@ -601,7 +601,6 @@ PACKAGE_STRING='vlna 1.3'
 PACKAGE_BUGREPORT='tex-live@tug.org'
 
 ac_unique_file="vlna.w"
-enable_option_checking=no
 ac_subst_vars='SHELL
 PATH_SEPARATOR
 PACKAGE_NAME
@@ -662,9 +661,6 @@ am__leading_dot
 AMTAR
 am__tar
 am__untar
-MAINTAINER_MODE_TRUE
-MAINTAINER_MODE_FALSE
-MAINT
 CC
 CFLAGS
 LDFLAGS
@@ -684,15 +680,16 @@ am__fastdepCC_FALSE
 CTANGLE
 CWEAVE
 CSPLAIN
-TETEX_BUILD_TRUE
-TETEX_BUILD_FALSE
+MAINTAINER_MODE_TRUE
+MAINTAINER_MODE_FALSE
+MAINT
 LIBOBJS
 LTLIBOBJS'
 ac_subst_files=''
 ac_user_opts='
 enable_option_checking
-enable_maintainer_mode
 enable_dependency_tracking
+enable_maintainer_mode
 '
       ac_precious_vars='build_alias
 host_alias
@@ -1328,10 +1325,10 @@ Optional Features:
   --disable-option-checking  ignore unrecognized --enable/--with options
   --disable-FEATURE       do not include FEATURE (same as --enable-FEATURE=no)
   --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
-  --enable-maintainer-mode  enable make rules and dependencies not useful
-			  (and sometimes confusing) to the casual installer
   --disable-dependency-tracking  speeds up one-time build
   --enable-dependency-tracking   do not reject slow dependency extractors
+  --enable-maintainer-mode  enable make rules and dependencies not useful
+			  (and sometimes confusing) to the casual installer
 
 Some influential environment variables:
   CC          C compiler command
@@ -2275,29 +2272,6 @@ am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'
 
 
 
-{ $as_echo "$as_me:$LINENO: checking whether to enable maintainer-specific portions of Makefiles" >&5
-$as_echo_n "checking whether to enable maintainer-specific portions of Makefiles... " >&6; }
-    # Check whether --enable-maintainer-mode was given.
-if test "${enable_maintainer_mode+set}" = set; then
-  enableval=$enable_maintainer_mode; USE_MAINTAINER_MODE=$enableval
-else
-  USE_MAINTAINER_MODE=no
-fi
-
-  { $as_echo "$as_me:$LINENO: result: $USE_MAINTAINER_MODE" >&5
-$as_echo "$USE_MAINTAINER_MODE" >&6; }
-   if test $USE_MAINTAINER_MODE = yes; then
-  MAINTAINER_MODE_TRUE=
-  MAINTAINER_MODE_FALSE='#'
-else
-  MAINTAINER_MODE_TRUE='#'
-  MAINTAINER_MODE_FALSE=
-fi
-
-  MAINT=$MAINTAINER_MODE_TRUE
-
-
-
 # Checks for programs.
 ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
@@ -3655,24 +3629,37 @@ done
 test -n "$CSPLAIN" || CSPLAIN="none"
 
 
-if test x"$USE_MAINTAINER_MODE" = xyes; then
+if test x"$enable_maintainer_mode" = xyes; then
   case :$CTANGLE:$CWEAVE:$CSPLAIN: in
   *:none:*)
-    { { $as_echo "$as_me:$LINENO: error: Maintainer mode requires ctangle, cweave, and csplain in your PATH." >&5
-$as_echo "$as_me: error: Maintainer mode requires ctangle, cweave, and csplain in your PATH." >&2;}
-   { (exit 1); exit 1; }; }
+    { $as_echo "$as_me:$LINENO: WARNING: Maintainer mode disabled -- requires ctangle, cweave, and csplain." >&5
+$as_echo "$as_me: WARNING: Maintainer mode disabled -- requires ctangle, cweave, and csplain." >&2;}
+    enable_maintainer_mode=no
   ;;
   esac
 fi
 
- if test x"$enable_tetex_build" = xyes; then
-  TETEX_BUILD_TRUE=
-  TETEX_BUILD_FALSE='#'
+{ $as_echo "$as_me:$LINENO: checking whether to enable maintainer-specific portions of Makefiles" >&5
+$as_echo_n "checking whether to enable maintainer-specific portions of Makefiles... " >&6; }
+    # Check whether --enable-maintainer-mode was given.
+if test "${enable_maintainer_mode+set}" = set; then
+  enableval=$enable_maintainer_mode; USE_MAINTAINER_MODE=$enableval
+else
+  USE_MAINTAINER_MODE=no
+fi
+
+  { $as_echo "$as_me:$LINENO: result: $USE_MAINTAINER_MODE" >&5
+$as_echo "$USE_MAINTAINER_MODE" >&6; }
+   if test $USE_MAINTAINER_MODE = yes; then
+  MAINTAINER_MODE_TRUE=
+  MAINTAINER_MODE_FALSE='#'
 else
-  TETEX_BUILD_TRUE='#'
-  TETEX_BUILD_FALSE=
+  MAINTAINER_MODE_TRUE='#'
+  MAINTAINER_MODE_FALSE=
 fi
 
+  MAINT=$MAINTAINER_MODE_TRUE
+
 
 ac_config_files="$ac_config_files Makefile"
 
@@ -3809,13 +3796,6 @@ LIBOBJS=$ac_libobjs
 LTLIBOBJS=$ac_ltlibobjs
 
 
-if test -z "${MAINTAINER_MODE_TRUE}" && test -z "${MAINTAINER_MODE_FALSE}"; then
-  { { $as_echo "$as_me:$LINENO: error: conditional \"MAINTAINER_MODE\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-$as_echo "$as_me: error: conditional \"MAINTAINER_MODE\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
-   { (exit 1); exit 1; }; }
-fi
 if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then
   { { $as_echo "$as_me:$LINENO: error: conditional \"AMDEP\" was never defined.
 Usually this means the macro was only invoked conditionally." >&5
@@ -3830,10 +3810,10 @@ $as_echo "$as_me: error: conditional \"am__fastdepCC\" was never defined.
 Usually this means the macro was only invoked conditionally." >&2;}
    { (exit 1); exit 1; }; }
 fi
-if test -z "${TETEX_BUILD_TRUE}" && test -z "${TETEX_BUILD_FALSE}"; then
-  { { $as_echo "$as_me:$LINENO: error: conditional \"TETEX_BUILD\" was never defined.
+if test -z "${MAINTAINER_MODE_TRUE}" && test -z "${MAINTAINER_MODE_FALSE}"; then
+  { { $as_echo "$as_me:$LINENO: error: conditional \"MAINTAINER_MODE\" was never defined.
 Usually this means the macro was only invoked conditionally." >&5
-$as_echo "$as_me: error: conditional \"TETEX_BUILD\" was never defined.
+$as_echo "$as_me: error: conditional \"MAINTAINER_MODE\" was never defined.
 Usually this means the macro was only invoked conditionally." >&2;}
    { (exit 1); exit 1; }; }
 fi