For PR automake/215:

	* configure.in: Use AM_AUTOMAKE_OPTIONS.
	* Makefile.am (AUTOMAKE_OPTIONS): Removed.
	* automake.texi (Macros): Document AM_AUTOMAKE_OPTIONS.
	(Options): Mention AM_AUTOMAKE_OPTIONS.
	* automake.in (global_options): New global.
	(global_options_line): Likewise.
	(scan_autoconf_traces): Trace AM_AUTOMAKE_OPTIONS.
	(scan_one_autoconf_file): Likewise.
	(process_option_list): New function.
	(handle_options): Use it.  Also, handle global options.
	* m4/Makefile.am (m4data_DATA): Added options.m4.
	* m4/options.m4: New file.

1 files changed, 42 insertions, 7 deletions

diff --git a/aclocal.m4 b/aclocal.m4
index 631051890..04e60a4a2 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -1,4 +1,4 @@
-# aclocal.m4 generated automatically by aclocal 1.5b -*- Autoconf -*-
+# aclocal.m4 generated automatically by aclocal 1.5c -*- Autoconf -*-
 
 # Copyright 1996, 1997, 1998, 1999, 2000, 2001
 # Free Software Foundation, Inc.
@@ -494,11 +494,13 @@ AC_SUBST([AMDEPBACKSLASH])
 # ------------------------------
 AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS],
 [for mf in $CONFIG_FILES; do
-  case $mf in
-  Makefile) dirpart=.;;
-  */Makefile) dirpart=`AS_DIRNAME("$mf")`;;
-  *) continue;;
-  esac
+  # Strip MF so we end up with the name of the file.
+  mf=`echo "$mf" | sed -e 's/:.*$//'`
+  if (head -1 $mf | fgrep 'generated by automake') > /dev/null 2>&1; then
+    dirpart=`AS_DIRNAME("$mf")`
+  else
+    dirpart=
+  fi
   grep '^DEP_FILES *= *[[^ @%:@]]' < "$mf" > /dev/null || continue
   # Extract the definition of DEP_FILES from the Makefile without
   # running `make'.
@@ -642,7 +644,40 @@ if $2; then
 else
   $1_TRUE='#'
   $1_FALSE=
-fi])
+fi
+AC_CONFIG_COMMANDS_PRE(
+[if test -z "${$1_TRUE}" && test -z "${$1_FALSE}"; then
+  AC_MSG_ERROR([conditional \"$1\" was never defined.
+Usually this means the macro was only invoked conditionally.])
+fi])])
+
+# Do all the work for Automake.                            -*- Autoconf -*-
+
+# Copyright 2001 Free Software Foundation, Inc.
+
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+# 02111-1307, USA.
+
+# serial 1
+
+# AM_AUTOMAKE_OPTIONS([OPTIONS])
+# ------------------------------
+# Set some automake options globally.
+AC_DEFUN([AM_AUTOMAKE_OPTIONS],
+[dnl nothing
+])
 
 # Copyright 2001 Free Software Foundation, Inc.             -*- Autoconf -*-