bootstrap: reorder function definitions to keep func_buildreq_* together.

* bootstrap: Restore asciibetical order, so that all the
buildreq function definitions are together.

Signed-off-by: Gary V. Vaughan <gary@gnu.org>

1 files changed, 126 insertions, 126 deletions

diff --git a/bootstrap b/bootstrap
index d4049e50..bfdbfbdc 100755
--- a/bootstrap
+++ b/bootstrap
@@ -862,6 +862,112 @@ func_require_aclocal_amflags ()
 }
 
 
+# require_autoheader
+# ------------------
+# Skip autoheader if it's not needed.
+require_autoheader=func_require_autoheader
+func_require_autoheader ()
+{
+    $debug_cmd
+
+    test true = "$AUTOHEADER" || {
+      func_extract_trace AC_CONFIG_HEADERS
+      test -n "$func_extract_trace_result" \
+	  || func_extract_trace AC_CONFIG_HEADER
+
+      test -n "$func_extract_trace_result" || {
+        AUTOHEADER=true
+
+        func_verbose "export AUTOHEADER='$AUTOHEADER'"
+
+        # Make sure the search result is visible to subshells
+        export AUTOHEADER
+      }
+    }
+
+    require_autoheader=:
+}
+
+
+# require_autopoint
+# -----------------
+# Skip autopoint if it's not needed.
+require_autopoint=func_require_autopoint
+func_require_autopoint ()
+{
+    $debug_cmd
+
+    test true = "$AUTOPOINT" || {
+      func_extract_trace AM_GNU_GETTEXT_VERSION
+
+      test -n "$func_extract_trace_result" || {
+        AUTOPOINT=true
+
+        func_verbose "export AUTOPOINT='$AUTOPOINT'"
+
+        # Make sure the search result is visible to subshells
+        export AUTOPOINT
+      }
+    }
+
+    require_autopoint=:
+}
+
+
+# require_bootstrap_uptodate
+# --------------------------
+# Complain if the version of bootstrap in the gnulib directory differs
+# from the one we are running.
+require_bootstrap_uptodate=func_require_bootstrap_uptodate
+func_require_bootstrap_uptodate ()
+{
+    $debug_cmd
+
+    $require_gnulib_path
+
+    test x = x"$gnulib_path" \
+        || func_cmp_s $progpath $gnulib_path/build-aux/bootstrap \
+        || func_warning upgrade "\
+\`$progpath' differs from \`./$gnulib_path/build-aux/bootstrap',
+please consider adopting the canonical version from gnulib."
+
+    require_bootstrap_uptodate=:
+}
+
+
+# require_build_aux
+# -----------------
+# Ensure that `$build_aux' is set, and if it doesn't already point to an
+# existing directory, create one.
+require_build_aux=func_require_build_aux
+func_require_build_aux ()
+{
+    $debug_cmd
+
+    test -n "$build_aux" || {
+      func_extract_trace AC_CONFIG_AUX_DIR
+      build_aux=$func_extract_trace_result
+      func_check_configuration build_aux \
+          "AC_CONFIG_AUX_DIR([name of a directory for build scripts])"
+
+      func_verbose "build_aux='$build_aux'"
+    }
+
+    $require_vc_ignore_files
+
+    # If the build_aux directory doesn't exist, create it now, and mark it
+    # as ignored for the VCS.
+    if test ! -d "$build_aux"; then
+      func_show_eval "mkdir '$build_aux'"
+
+      test -n "$vc_ignore_files" \
+          || func_insert_sorted_if_absent "$build_aux" $vc_ignore_files
+    fi
+
+    require_build_aux=:
+}
+
+
 # require_buildreq_autobuild
 # --------------------------
 # Try to find whether the bootstrap requires autobuild.
@@ -930,33 +1036,6 @@ for tool in autoconf libtoolize autopoint; do
 done
 
 
-# require_autoheader
-# ------------------
-# Skip autoheader if it's not needed.
-require_autoheader=func_require_autoheader
-func_require_autoheader ()
-{
-    $debug_cmd
-
-    test true = "$AUTOHEADER" || {
-      func_extract_trace AC_CONFIG_HEADERS
-      test -n "$func_extract_trace_result" \
-	  || func_extract_trace AC_CONFIG_HEADER
-
-      test -n "$func_extract_trace_result" || {
-        AUTOHEADER=true
-
-        func_verbose "export AUTOHEADER='$AUTOHEADER'"
-
-        # Make sure the search result is visible to subshells
-        export AUTOHEADER
-      }
-    }
-
-    require_autoheader=:
-}
-
-
 # require_buildreq_automake
 # -------------------------
 # Try to find the minimum compatible version of automake required to
@@ -988,82 +1067,32 @@ func_require_buildreq_automake()
 }
 
 
-# require_autopoint
-# -----------------
-# Skip autopoint if it's not needed.
-require_autopoint=func_require_autopoint
-func_require_autopoint ()
-{
-    $debug_cmd
-
-    test true = "$AUTOPOINT" || {
-      func_extract_trace AM_GNU_GETTEXT_VERSION
-
-      test -n "$func_extract_trace_result" || {
-        AUTOPOINT=true
-
-        func_verbose "export AUTOPOINT='$AUTOPOINT'"
-
-        # Make sure the search result is visible to subshells
-        export AUTOPOINT
-      }
-    }
-
-    require_autopoint=:
-}
-
-
-# require_bootstrap_uptodate
-# --------------------------
-# Complain if the version of bootstrap in the gnulib directory differs
-# from the one we are running.
-require_bootstrap_uptodate=func_require_bootstrap_uptodate
-func_require_bootstrap_uptodate ()
-{
-    $debug_cmd
-
-    $require_gnulib_path
-
-    test x = x"$gnulib_path" \
-        || func_cmp_s $progpath $gnulib_path/build-aux/bootstrap \
-        || func_warning upgrade "\
-\`$progpath' differs from \`./$gnulib_path/build-aux/bootstrap',
-please consider adopting the canonical version from gnulib."
-
-    require_bootstrap_uptodate=:
-}
-
-
-# require_build_aux
-# -----------------
-# Ensure that `$build_aux' is set, and if it doesn't already point to an
-# existing directory, create one.
-require_build_aux=func_require_build_aux
-func_require_build_aux ()
+# require_buildreq_patch
+# ----------------------
+# Automatically add a patch build-requirement if there are diff files
+# in $local_gl_dir.
+require_buildreq_patch=func_require_buildreq_patch
+func_require_buildreq_patch ()
 {
     $debug_cmd
 
-    test -n "$build_aux" || {
-      func_extract_trace AC_CONFIG_AUX_DIR
-      build_aux=$func_extract_trace_result
-      func_check_configuration build_aux \
-          "AC_CONFIG_AUX_DIR([name of a directory for build scripts])"
+    # This ensures PATCH is set appropriately by the time
+    # func_check_versions enforces $buildreq.
+    $require_patch
 
-      func_verbose "build_aux='$build_aux'"
+    # If patch is not already listed in $buildreq...
+    printf '%s\n' "$buildreq" |func_grep_q '^[	 ]*patch' || {
+      # The ugly find invocation is necessary to exit with non-zero
+      # status for old find binaries that don't support -exec fully.
+      if test ! -d "$local_gl_dir" \
+          || find "$local_gl_dir" -name *.diff -exec false {} +; then :
+      else
+          func_append buildreq 'patch - http://www.gnu.org/s/patch
+'
+      fi
     }
 
-    $require_vc_ignore_files
-
-    # If the build_aux directory doesn't exist, create it now, and mark it
-    # as ignored for the VCS.
-    if test ! -d "$build_aux"; then
-      func_show_eval "mkdir '$build_aux'"
-
-      test -n "$vc_ignore_files" \
-          || func_insert_sorted_if_absent "$build_aux" $vc_ignore_files
-    fi
-
-    require_build_aux=:
+    require_buildreq_patch=:
 }
 
 
@@ -1639,35 +1668,6 @@ func_require_patch ()
 }
 
 
-# require_buildreq_patch
-# ----------------------
-# Automatically add a patch build-requirement if there are diff files
-# in $local_gl_dir.
-require_buildreq_patch=func_require_buildreq_patch
-func_require_buildreq_patch ()
-{
-    $debug_cmd
-
-    # This ensures PATCH is set appropriately by the time
-    # func_check_versions enforces $buildreq.
-    $require_patch
-
-    # If patch is not already listed in $buildreq...
-    printf '%s\n' "$buildreq" |func_grep_q '^[	 ]*patch' || {
-      # The ugly find invocation is necessary to exit with non-zero
-      # status for old find binaries that don't support -exec fully.
-      if test ! -d "$local_gl_dir" \
-          || find "$local_gl_dir" -name *.diff -exec false {} +; then :
-      else
-          func_append buildreq 'patch - http://www.gnu.org/s/patch
-'
-      fi
-    }
-
-    require_buildreq_patch=:
-}
-
-
 # require_source_base
 # -------------------
 # Ensure that source_base has a sensible value, extracted from