Index: ChangeLog
from  Gary V. Vaughan  <address@hidden>
	* src/Makefile.am (m4_SOURCES): Don't list $(M4OBJS) here, since
	Automake 1.5 chokes on dynamic source file lists,  Besides, it is
	already listed in m4_LDADD... how did that ever used to work?
	* configure.in (getopt.h): Use AC_CONFIG_LINKS instead of a manual
	link.
	* config/gnu-obstack.m4 (M4_AC_FUNC_OBSTACK): Ditto.
	Suggested by Tim Van Holder <address@hidden>

Index: configure.in
===================================================================
RCS file: /cvsroot/m4/m4/configure.in,v
retrieving revision 1.19
diff -u -r1.19 configure.in
--- configure.in 2001/08/30 21:57:00 1.19
+++ configure.in 2001/09/01 10:29:44
@@ -87,8 +87,7 @@
 rm -f $m4_getopt_h
 AC_CHECK_FUNC(getopt_long, [],
 [M4OBJS="getopt1.$ac_objext getopt.$ac_objext"
-echo linking src/gnu-getopt.h to $m4_getopt_h
-$LN_S ./gnu-getopt.h $m4_getopt_h])
+AC_CONFIG_LINKS($m4_getopt_h:src/gnu-getopt.h)])
 AC_SUBST(M4OBJS)
 
 M4_AC_FUNC_OBSTACK
Index: config/gnu-obstack.m4
===================================================================
RCS file: /cvsroot/m4/m4/config/gnu-obstack.m4,v
retrieving revision 1.6
diff -u -r1.6 gnu-obstack.m4
--- config/gnu-obstack.m4 2001/08/17 12:57:22 1.6
+++ config/gnu-obstack.m4 2001/09/01 10:29:46
@@ -57,8 +57,7 @@
 EOF
 else
   LIBOBJS="$LIBOBJS obstack.$ac_objext"
-  echo linking src/gnu-obstack.h to $m4_obstack_h
-  $LN_S ./gnu-obstack.h $m4_obstack_h
+  AC_CONFIG_LINKS($m4_obstack_h:./gnu-obstack.h)
 
   if test x"$ac_cv_header_obstack_h" != xyes; then
     OBSTACK_H=obstack.h
Index: src/Makefile.am
===================================================================
RCS file: /cvsroot/m4/m4/src/Makefile.am,v
retrieving revision 1.6
diff -u -r1.6 Makefile.am
--- src/Makefile.am 2001/08/20 20:25:25 1.6
+++ src/Makefile.am 2001/09/01 10:29:46
@@ -1,16 +1,16 @@
 ## This file is part of GNU m4
 ## Copyright 2000 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 of the License, or 
+## the Free Software Foundation; either version 2 of the License, 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
@@ -26,9 +26,8 @@
 noinst_HEADERS = gnu-getopt.h
 
 bin_PROGRAMS = m4
-m4_SOURCES = main.c m4.h freeze.c stackovf.c $(M4OBJS)
+m4_SOURCES = main.c m4.h freeze.c stackovf.c
 EXTRA_m4_SOURCES = getopt.c getopt1.c
-
 
 m4_LDADD = $(M4OBJS) $(top_builddir)/m4/libm4.la $(LIBADD_DL) $(INTLLIBS)
 m4_LDFLAGS = -no-undefined -export-dynamic $(DLPREOPEN)