AM_FUNC_FNMATCH is obsolete

7 files changed, 24 insertions, 44 deletions

diff --git a/ChangeLog b/ChangeLog
index 9f34d08f3..0a26f88c4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 Fri Nov 15 18:58:04 1996  Tom Tromey  <tromey@cygnus.com>
 
+	* aclocal.in (obsolete_macros): Include AM_FUNC_FNMATCH.
+	* automake.in (scan_configure): Recognize AC_FUNC_FNMATCH.
+	* m4/fnmatch.m4: Removed (now in autoconf).
+
 	* automake.in (initialize_per_input): Init de_ansi_objects.
 	(handle_single_transform_list): Error if extension unrecognized.
 	Set elements of de_ansi_objects.
diff --git a/TODO b/TODO
index 4299262ff..0d13e94aa 100644
--- a/TODO
+++ b/TODO
@@ -25,9 +25,6 @@ Further:
 
 Avoid loops when installing; instead unroll them in automake
 
-Franc,ois> * ansi2knr was uselessly compiled, and it might be an
-Franc,ois> Automake problem:
-
 Some long-term projects:
 * if $(FOO) is used somewhere, ensure FOO is defined, either by
   user or by automake if possible
@@ -89,9 +86,12 @@ from joerg-martin schwarz:
     in an explicitly written rule,  you should emit the corresponding
     Makefile variables automatically.
 
-add support for Makefile.tmpl that is auto-included in every
-Makefile.am.  That makes it easier to do some non-std thing in every
-subdirectory.
+Configuring in the large:
+* add support for Makefile.tmpl that is auto-included in every
+  Makefile.am.  That makes it easier to do some non-std thing in every
+  subdirectory.
+* allow hierarchy of dirs to share one aclocal.m4
+  How?
 
 consider printing full file name of Makefile.am or configure.in when
 giving error.  This would help for very large trees with many
@@ -116,9 +116,6 @@ should be able to determine what is built by looking at rules (and
 configure.in).  Then built man pages (eg) could automatically be
 omitted from the distribution.
 
-Consider using libfoo_SOURCES, etc, for libraries.  From Gord
-Matzigkeit.  There is a patch.
-
 Idea from Joerg-Martin Schwarz: allow passing different -D flags to
 different compiles.  This can be done, but with the restriction that a
 .c cannot appear in 2 different "objects" (programs/libraries)
@@ -145,9 +142,6 @@ Then user must use "make -k check".  This is probably more natural.
 
 Consider: "cvs" option adds some cvs-specific rules?
 
-Automake: devo/inet/Makefile.am has "all-local".  "install" depends on
-"all", but the local installs get run before the stuff in "all".  Gross.
-
 Right now, targets generated internally (eg "install") are not
 overridable by user code.  This should probably be possible, even
 though it isn't very important.  This could be done by generating all
@@ -168,11 +162,12 @@ Other priorities:
 
 Things to finish libtool support:
 * Handle grody compilation issue
+  Namely: some objects require a different compilation rule
 * Handle install changes
 * Handle clean changes
 * New definition for LINK
 
-DJM wants ``LINKS'' variable; list of things to link together after
+djm wants ``LINKS'' variable; list of things to link together after
 install.  In BSD environment, use:
 	LINKS = from1 to1 from2 to2 ...
 
@@ -220,10 +215,6 @@ Clean up the output:
 * Ensure every line has a purpose.  Omit unused stuff
 * Eliminate extraneous rules when possible (eg 'install-am' stuff)
 * Make sure vertical spacing is correct
-* pretty-print targets
-* regularize how backslash-newline is done.  Just one space between text
-  and backslash should be the rule.  Update makefile-mode to allow this.
-  (set column to 0, probably)
 Omit program transform vars from header if no program installed.  This
 is currently pretty hard to do.  (But with beautification code it
 would probably be easy)
@@ -407,6 +398,11 @@ For Cygnus it would probably be good to be able to handle the native
 package utility on each platform.  There are probably 3 or 4 of these
 (sysv, solaris?, aix?)
 
+tcl/unix/Makefile.in has some code to generate a Solaris package.
+
+Automake probably can't do all of this on its own.  A new tool might
+be a better idea
+
 ================================================================
 
 A tool to guess what the local Makefile.am should look like:
diff --git a/aclocal.in b/aclocal.in
index e0c32dca0..2b40bd87c 100644
--- a/aclocal.in
+++ b/aclocal.in
@@ -76,6 +76,10 @@ $verbosity = 0;
      'jm_MAINTAINER_MODE',
      'md_TYPE_PTRDIFF_T',
      'ud_PATH_LISPDIR',
+
+     # Now part of autoconf proper, under a different name.
+     'AM_FUNC_FNMATCH',
+
 # These aren't quite obsolete.
 #      'md_PATH_PROG',
 #      'ud_GNU_GETTEXT',
diff --git a/automake.in b/automake.in
index d00ae1b90..790dc3c58 100755
--- a/automake.in
+++ b/automake.in
@@ -2961,7 +2961,7 @@ sub scan_configure
 	{
 	    $libsources{'fileblocks.c'} = 1;
 	}
-	elsif (/AM_FUNC_FNMATCH/)
+	elsif (/AC_FUNC_FNMATCH/)
 	{
 	    $libsources{'fnmatch.c'} = 1;
 	}
diff --git a/m4/Makefile.am b/m4/Makefile.am
index 8fad0f6c2..1ac5a6cb4 100644
--- a/m4/Makefile.am
+++ b/m4/Makefile.am
@@ -4,7 +4,7 @@ AUTOMAKE_OPTIONS = gnits
 MAINT_CHARSET = latin1
 
 m4datadir = $(datadir)/aclocal
-m4data_DATA = ccsanity.m4 ccstdc.m4 dmalloc.m4 fnmatch.m4 init.m4 install.m4 \
+m4data_DATA = ccsanity.m4 ccstdc.m4 dmalloc.m4 init.m4 install.m4 \
 lispdir.m4 maintainer.m4 protos.m4 ptrdiff.m4 regex.m4 strtod.m4 termios.m4 \
 winsz.m4 mktime.m4 error.m4 obstack.m4 sanity.m4
 
diff --git a/m4/Makefile.in b/m4/Makefile.in
index e37b383f5..76a075ba4 100644
--- a/m4/Makefile.in
+++ b/m4/Makefile.in
@@ -43,7 +43,7 @@ AUTOMAKE_OPTIONS = gnits
 MAINT_CHARSET = latin1
 
 m4datadir = $(datadir)/aclocal
-m4data_DATA = ccsanity.m4 ccstdc.m4 dmalloc.m4 fnmatch.m4 init.m4 install.m4 \
+m4data_DATA = ccsanity.m4 ccstdc.m4 dmalloc.m4 init.m4 install.m4 \
 lispdir.m4 maintainer.m4 protos.m4 ptrdiff.m4 regex.m4 strtod.m4 termios.m4 \
 winsz.m4 mktime.m4 error.m4 obstack.m4 sanity.m4
 
diff --git a/m4/fnmatch.m4 b/m4/fnmatch.m4
deleted file mode 100644
index 2ab15f2df..000000000
--- a/m4/fnmatch.m4
+++ /dev/null
@@ -1,24 +0,0 @@
-## --------------------------- ##
-## Check for a working fnmatch ##
-## --------------------------- ##
-
-# serial 1
-
-# @defmac AC_FUNC_FNMATCH
-# @maindex FUNC_FNMATCH
-# @ovindex LIBOBJS
-# If the @code{fnmatch} function is not available, or does not work
-# correctly (like the one on SunOS 5.4), add @samp{fnmatch.o} to output
-# variable @code{LIBOBJS}.
-# @end defmac
-
-AC_DEFUN(AM_FUNC_FNMATCH,
-[AC_MSG_CHECKING(for working fnmatch)
-AC_CACHE_VAL(am_cv_func_fnmatch,
-# Some versions of Solaris or SCO have broken fnmatch() functions!
-# So we run a test program.  If we're cross-compiling, take no chance.
-AC_TRY_RUN([main() { exit (fnmatch ("a*", "abc", 0) != 0); }],
-am_cv_func_fnmatch=yes, am_cv_func_fnmatch=no, am_cv_func_fnmatch=no))
-test $am_cv_func_fnmatch = yes || LIBOBJS="$LIBOBJS fnmatch.o"
-AC_MSG_RESULT($am_cv_func_fnmatch)
-])