* Makefile.am: Add ACLOCAL_AMFLAGS.

* configure.in: Change macro call order.
        * Makefile.in: Regenerate.
        * configure: Regenerate.

binutils/ChangeLog

@@ -1,3 +1,10 @@
+2007-04-14  Steve Ellcey  <sje@cup.hp.com>
+
+	* Makefile.am: Add ACLOCAL_AMFLAGS.
+	* configure.in: Change macro call order.
+	* Makefile.in: Regenerate.
+	* configure: Regenerate.
+
 2007-04-13  Nathan Sidwell  <nathan@codesourcery.com>
 
 	* Makefile.am (TOOL_PROGS): Add objcopy.

binutils/Makefile.am

@@ -1,6 +1,7 @@
 ## Process this file with automake to generate Makefile.in
 
 AUTOMAKE_OPTIONS = cygnus dejagnu
+ACLOCAL_AMFLAGS = -I ..
 
 SUBDIRS = doc po
 

binutils/Makefile.in

@@ -332,6 +332,7 @@ target_cpu = @target_cpu@
 target_os = @target_os@
 target_vendor = @target_vendor@
 AUTOMAKE_OPTIONS = cygnus dejagnu
+ACLOCAL_AMFLAGS = -I ..
 SUBDIRS = doc po
 tooldir = $(exec_prefix)/$(target_alias)
 YFLAGS = -d

binutils/configure.in

@@ -11,7 +11,9 @@ BFD_VERSION=`sed -n -e 's/^.._INIT_AUTOMAKE.*,[ 	]*\([^ 	]*\)[ 	]*).*/\1/p' < ${
 changequote([,])dnl
 AM_INIT_AUTOMAKE(binutils, ${BFD_VERSION})
 
-AM_PROG_LIBTOOL
+AC_PROG_CC
+AC_GNU_SOURCE
+AC_PROG_LIBTOOL
 
 AC_ARG_ENABLE(targets,
 [  --enable-targets        alternative target configurations],
@@ -40,9 +42,6 @@ if test -z "$host" ; then
     AC_MSG_ERROR(Unrecognized host system type; please check config.sub.)
 fi
 
-AC_PROG_CC
-AC_GNU_SOURCE
-
 AC_PROG_YACC
 AM_PROG_LEX