Formatting changes.

diff --git a/acgeneral.m4 b/acgeneral.m4
index 6139087348ba20e87cea2244446a7a63289ad32f..5d9f41da7d110f6ceaabe767636cf676cffe948e 100644 (file)
--- a/acgeneral.m4
+++ b/acgeneral.m4
@@ -709,6 +709,72 @@ define([AC_PREREQ],
 ## ---------------- ##
 
 
+# All the following macros are used by AC_INIT.  Ideally, they should
+# be presented in the order in which they are output.  Please, help us
+# sorting it, or at least, don't augment the entropy.
+
+
+# _AC_INIT_NOTICE
+# ---------------
+define([_AC_INIT_NOTICE],
+[m4_divert([NOTICE],
+[@%:@ Guess values for system-dependent variables and create Makefiles.
+@%:@ Generated by Autoconf AC_ACVERSION[]dnl
+ifset([AC_PACKAGE_STRING], [ for AC_PACKAGE_STRING]).])
+
+ifset([AC_PACKAGE_BUGREPORT],
+      [m4_divert([NOTICE],
+                 [@%:@
+@%:@ Report bugs to <AC_PACKAGE_BUGREPORT>.])])
+])
+
+
+# _AC_INIT_COPYRIGHT
+# ------------------
+define([_AC_INIT_COPYRIGHT],
+[AC_COPYRIGHT(
+[Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000
+Free Software Foundation, Inc.
+This configure script is free software; the Free Software Foundation
+gives unlimited permission to copy, distribute and modify it.])dnl
+])
+
+
+# _AC_INIT_PREPARE_ENVIRONMENT
+# ----------------------------
+# Tune the behavior of the shell.
+define([_AC_INIT_PREPARE_ENVIRONMENT],
+[# Be Bourne compatible
+if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
+  emulate sh
+  NULLCMD=:
+elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then
+  set -o posix
+fi
+
+_AS_UNSET_PREPARE
+
+# NLS nuisances.
+AS_UNSET([LANG],        [C])
+AS_UNSET([LC_ALL],      [C])
+AS_UNSET([LC_TIME],     [C])
+AS_UNSET([LC_CTYPE],    [C])
+AS_UNSET([LANGUAGE],    [C])
+AS_UNSET([LC_COLLATE],  [C])
+AS_UNSET([LC_NUMERIC],  [C])
+AS_UNSET([LC_MESSAGES], [C])
+
+# IFS
+# We need space, tab and new line, in precisely that order.
+ac_nl='
+'
+IFS="  $ac_nl"
+
+# CDPATH.
+AS_UNSET([CDPATH], [:])
+])
+
+
 # _AC_INIT_DEFAULTS
 # -----------------
 # Values which defaults can be set from `configure.in'.
@@ -1374,41 +1440,6 @@ fi])dnl
 ])# _AC_INIT_VERSION
 
 
-# _AC_INIT_PREPARE_ENVIRONMENT
-# ----------------------------
-# Tune the behavior of the shell.
-define([_AC_INIT_PREPARE_ENVIRONMENT],
-[# Be Bourne compatible
-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
-  emulate sh
-  NULLCMD=:
-elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then
-  set -o posix
-fi
-
-_AS_UNSET_PREPARE
-
-# NLS nuisances.
-AS_UNSET([LANG],        [C])
-AS_UNSET([LC_ALL],      [C])
-AS_UNSET([LC_TIME],     [C])
-AS_UNSET([LC_CTYPE],    [C])
-AS_UNSET([LANGUAGE],    [C])
-AS_UNSET([LC_COLLATE],  [C])
-AS_UNSET([LC_NUMERIC],  [C])
-AS_UNSET([LC_MESSAGES], [C])
-
-# IFS
-# We need space, tab and new line, in precisely that order.
-ac_nl='
-'
-IFS="  $ac_nl"
-
-# CDPATH.
-AS_UNSET([CDPATH], [:])
-])
-
-
 # _AC_INIT_PREPARE_FDS
 # --------------------
 # Set up the file descriptors used by `configure'.
@@ -1540,32 +1571,6 @@ m4_divert_pop()dnl
 ])# _AC_INIT_PREPARE
 
 
-# _AC_INIT_NOTICE
-# ---------------
-define([_AC_INIT_NOTICE],
-[m4_divert([NOTICE],
-[@%:@ Guess values for system-dependent variables and create Makefiles.
-@%:@ Generated by Autoconf AC_ACVERSION[]dnl
-ifset([AC_PACKAGE_STRING], [ for AC_PACKAGE_STRING]).])
-
-ifset([AC_PACKAGE_BUGREPORT],
-      [m4_divert([NOTICE],
-                 [@%:@
-@%:@ Report bugs to <AC_PACKAGE_BUGREPORT>.])])
-])
-
-
-# _AC_INIT_COPYRIGHT
-# ------------------
-define([_AC_INIT_COPYRIGHT],
-[AC_COPYRIGHT(
-[Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000
-Free Software Foundation, Inc.
-This configure script is free software; the Free Software Foundation
-gives unlimited permission to copy, distribute and modify it.])dnl
-])
-
-
 # AU::AC_INIT([UNIQUE-FILE-IN-SOURCE-DIR])
 # ----------------------------------------
 # This macro is used only for Autoupdate.

diff --git a/lib/autoconf/general.m4 b/lib/autoconf/general.m4
index 6139087348ba20e87cea2244446a7a63289ad32f..5d9f41da7d110f6ceaabe767636cf676cffe948e 100644 (file)
--- a/lib/autoconf/general.m4
+++ b/lib/autoconf/general.m4
@@ -709,6 +709,72 @@ define([AC_PREREQ],
 ## ---------------- ##
 
 
+# All the following macros are used by AC_INIT.  Ideally, they should
+# be presented in the order in which they are output.  Please, help us
+# sorting it, or at least, don't augment the entropy.
+
+
+# _AC_INIT_NOTICE
+# ---------------
+define([_AC_INIT_NOTICE],
+[m4_divert([NOTICE],
+[@%:@ Guess values for system-dependent variables and create Makefiles.
+@%:@ Generated by Autoconf AC_ACVERSION[]dnl
+ifset([AC_PACKAGE_STRING], [ for AC_PACKAGE_STRING]).])
+
+ifset([AC_PACKAGE_BUGREPORT],
+      [m4_divert([NOTICE],
+                 [@%:@
+@%:@ Report bugs to <AC_PACKAGE_BUGREPORT>.])])
+])
+
+
+# _AC_INIT_COPYRIGHT
+# ------------------
+define([_AC_INIT_COPYRIGHT],
+[AC_COPYRIGHT(
+[Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000
+Free Software Foundation, Inc.
+This configure script is free software; the Free Software Foundation
+gives unlimited permission to copy, distribute and modify it.])dnl
+])
+
+
+# _AC_INIT_PREPARE_ENVIRONMENT
+# ----------------------------
+# Tune the behavior of the shell.
+define([_AC_INIT_PREPARE_ENVIRONMENT],
+[# Be Bourne compatible
+if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
+  emulate sh
+  NULLCMD=:
+elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then
+  set -o posix
+fi
+
+_AS_UNSET_PREPARE
+
+# NLS nuisances.
+AS_UNSET([LANG],        [C])
+AS_UNSET([LC_ALL],      [C])
+AS_UNSET([LC_TIME],     [C])
+AS_UNSET([LC_CTYPE],    [C])
+AS_UNSET([LANGUAGE],    [C])
+AS_UNSET([LC_COLLATE],  [C])
+AS_UNSET([LC_NUMERIC],  [C])
+AS_UNSET([LC_MESSAGES], [C])
+
+# IFS
+# We need space, tab and new line, in precisely that order.
+ac_nl='
+'
+IFS="  $ac_nl"
+
+# CDPATH.
+AS_UNSET([CDPATH], [:])
+])
+
+
 # _AC_INIT_DEFAULTS
 # -----------------
 # Values which defaults can be set from `configure.in'.
@@ -1374,41 +1440,6 @@ fi])dnl
 ])# _AC_INIT_VERSION
 
 
-# _AC_INIT_PREPARE_ENVIRONMENT
-# ----------------------------
-# Tune the behavior of the shell.
-define([_AC_INIT_PREPARE_ENVIRONMENT],
-[# Be Bourne compatible
-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
-  emulate sh
-  NULLCMD=:
-elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then
-  set -o posix
-fi
-
-_AS_UNSET_PREPARE
-
-# NLS nuisances.
-AS_UNSET([LANG],        [C])
-AS_UNSET([LC_ALL],      [C])
-AS_UNSET([LC_TIME],     [C])
-AS_UNSET([LC_CTYPE],    [C])
-AS_UNSET([LANGUAGE],    [C])
-AS_UNSET([LC_COLLATE],  [C])
-AS_UNSET([LC_NUMERIC],  [C])
-AS_UNSET([LC_MESSAGES], [C])
-
-# IFS
-# We need space, tab and new line, in precisely that order.
-ac_nl='
-'
-IFS="  $ac_nl"
-
-# CDPATH.
-AS_UNSET([CDPATH], [:])
-])
-
-
 # _AC_INIT_PREPARE_FDS
 # --------------------
 # Set up the file descriptors used by `configure'.
@@ -1540,32 +1571,6 @@ m4_divert_pop()dnl
 ])# _AC_INIT_PREPARE
 
 
-# _AC_INIT_NOTICE
-# ---------------
-define([_AC_INIT_NOTICE],
-[m4_divert([NOTICE],
-[@%:@ Guess values for system-dependent variables and create Makefiles.
-@%:@ Generated by Autoconf AC_ACVERSION[]dnl
-ifset([AC_PACKAGE_STRING], [ for AC_PACKAGE_STRING]).])
-
-ifset([AC_PACKAGE_BUGREPORT],
-      [m4_divert([NOTICE],
-                 [@%:@
-@%:@ Report bugs to <AC_PACKAGE_BUGREPORT>.])])
-])
-
-
-# _AC_INIT_COPYRIGHT
-# ------------------
-define([_AC_INIT_COPYRIGHT],
-[AC_COPYRIGHT(
-[Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000
-Free Software Foundation, Inc.
-This configure script is free software; the Free Software Foundation
-gives unlimited permission to copy, distribute and modify it.])dnl
-])
-
-
 # AU::AC_INIT([UNIQUE-FILE-IN-SOURCE-DIR])
 # ----------------------------------------
 # This macro is used only for Autoupdate.