PATCH (gcc-3_2-branch):

[Loren James Rittle]

A GNU make-ism crept into libstdc++-v3/testsuite/Makefile.in during a
recent regeneration.  This issue was detected using the daily
regression tester which, every other day, tests without GNU make.

Moved the obvious mainline patch, rebuilt libstdc++-v3 from scratch on
i386-unknown-freebsd4.7 in otherwise completely bootstrapped tree with
BSD make.  Self-approved and committed to the 3.2.X branch.

Regards,
Loren

2002-09-05  Loren J. Rittle  <ljrittle@acm.org>

	Move from mainline.
	* src/Makefile.am (AUTOMAKE_OPTIONS): Use cygnus-style generation.
	* testsuite/Makefile.am (AUTOMAKE_OPTIONS): Likewise.
	* src/Makefile.in: Regenerate (explicitly with --cygnus option).
	* testsuite/Makefile.in: Likewise.

[Somehow, this thunk from the original mainline patch was already moved
 and was thus ignored: * include/Makefile.am (AUTOMAKE_OPTIONS): Likewise.]

Patch move as expressed with cvs commands:

cvs update -j1.5 -j1.6 testsuite/Makefile.am
cvs update -j1.107 -j1.108 src/Makefile.am

Patch move as expressed in standard gcc mailing list format:

Index: testsuite/Makefile.am
===================================================================
RCS file: /cvs/gcc/gcc/libstdc++-v3/testsuite/Makefile.am,v
retrieving revision 1.4.24.3
diff -c -r1.4.24.3 Makefile.am
*** testsuite/Makefile.am	5 Sep 2002 16:10:08 -0000	1.4.24.3
--- testsuite/Makefile.am	6 Sep 2002 02:33:42 -0000
***************
*** 21,27 ****
  ## Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307,
  ## USA.
  
! AUTOMAKE_OPTIONS =  foreign dejagnu
  
  DEJATOOL = libstdc++-v3
  
--- 21,27 ----
  ## Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307,
  ## USA.
  
! AUTOMAKE_OPTIONS =  cygnus dejagnu
  
  DEJATOOL = libstdc++-v3
  
Index: src/Makefile.am
===================================================================
RCS file: /cvs/gcc/gcc/libstdc++-v3/src/Makefile.am,v
retrieving revision 1.103.2.4.2.1
diff -c -r1.103.2.4.2.1 Makefile.am
*** src/Makefile.am	1 Aug 2002 21:29:14 -0000	1.103.2.4.2.1
--- src/Makefile.am	6 Sep 2002 02:33:42 -0000
***************
*** 22,28 ****
  ## Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307,
  ## USA.
  
! AUTOMAKE_OPTIONS = 1.3 gnits
  MAINT_CHARSET = latin1
  
  mkinstalldirs = $(SHELL) $(toplevel_srcdir)/mkinstalldirs
--- 22,28 ----
  ## Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307,
  ## USA.
  
! AUTOMAKE_OPTIONS = 1.3 cygnus
  MAINT_CHARSET = latin1
  
  mkinstalldirs = $(SHELL) $(toplevel_srcdir)/mkinstalldirs