depend on automake 1.10a and configmake module

[Eric Blake]

CVS automake now makes it possible for us to no longer have to keep track of 
pathconf.h on CVS head (yes, this means that m4 2.0 can't come out until after 
automake 1.10.1 or 1.11; but Alexandre did state that he hopes the next 
automake version can come out in less time than the 1.9->1.10 transition).

branch-1_4 can still be built with automake 1.9.x (and that is intentional), 
although I will be using automake 1.10 when I release m4 1.4.8.

2006-10-16  Eric Blake  <address@hidden>

        * ltdl/m4/gnulib-cache.m4: Augment with 'gnulib-tool --import
        configmake'.
        * configure.ac (AM_INIT_AUTOMAKE): Bump requirement to 1.10a, for
        pkglibexecdir support.
        * Makefile.am (m4_libm4_la_SOURCES, m4/pathconf.h): No longer
        worry about pathconf.h, now that gnulib does it for us.
        (pkgmodincludedir): Simplify.
        (pkglibexecdir): Delete, now that automake does this.
        * m4/module.c (m4__module_init): Use PKGLIBEXECDIR.
        * src/main.c (usage): Likewise.
        * m4/symtab.c (m4_symbol_value_groks_macro): Fix typo.


Index: HACKING
===================================================================
RCS file: /sources/m4/m4/HACKING,v
retrieving revision 1.5
diff -u -r1.5 HACKING
--- HACKING     26 Sep 2006 13:12:58 -0000      1.5
+++ HACKING     16 Oct 2006 21:31:07 -0000
@@ -44,7 +44,7 @@
 
 * Before you can build from CVS, you need to bootstrap.  This requires a
   pre-installed version of GNU M4 1.4.x or later, built from a package,
-  Autoconf 2.60 or later, Automake 1.9b or later, CVS Head of Libtool
+  Autoconf 2.60 or later, Automake 1.10a or later, CVS Head of Libtool
   (will become Libtool 2.0), Gettext 0.15 or later, and a CVS checkout
   of gnulib.  Gnulib can be obtained by:
     cvs -z3 -d:pserver:address@hidden:/sources/gnulib co gnulib
Index: Makefile.am
===================================================================
RCS file: /sources/m4/m4/Makefile.am,v
retrieving revision 1.49
diff -u -r1.49 Makefile.am
--- Makefile.am 5 Oct 2006 23:07:28 -0000       1.49
+++ Makefile.am 16 Oct 2006 21:31:07 -0000
@@ -122,8 +122,7 @@
 ## Modules. ##
 ## -------- ##
 
-pkgmodincludedir= $(includedir)/$(PACKAGE)/modules
-pkglibexecdir  = $(libexecdir)/$(PACKAGE)
+pkgmodincludedir= $(pkgincludedir)/modules
 
 ETAGS_ARGS     = --regex='/M4BUILTIN_HANDLER[ \t]*)\([^)]*\)/\1/'
 
@@ -233,7 +232,6 @@
                  m4/module.c \
                  m4/output.c \
                  m4/path.c \
-                 m4/pathconf.h \
                  m4/resyntax.c \
                  m4/symtab.c \
                  m4/syntax.c \
@@ -242,12 +240,6 @@
                  $(LIBLTDL) $(LTLIBINTL) $(LIBADD_DL)
 m4_libm4_la_DEPENDENCIES = $(LIBLTDL) gnu/libgnu.la
 
-m4/pathconf.h:
-       echo "#define MODULE_PATH \"$(pkglibexecdir)\"" > m4/pathconf.h
-
-MOSTLYCLEANFILES += m4/pathconf.h
-BUILT_SOURCES    += m4/pathconf.h
-
 # This file needs to be regenerated at configure time.
 dist-hook:
        rm -f $(distdir)/m4/system.h
Index: configure.ac
===================================================================
RCS file: /sources/m4/m4/configure.ac,v
retrieving revision 1.58
diff -u -r1.58 configure.ac
--- configure.ac        13 Oct 2006 16:46:47 -0000      1.58
+++ configure.ac        16 Oct 2006 21:31:07 -0000
@@ -67,7 +67,7 @@
 ## ------------------------ ##
 ## Automake Initialization. ##
 ## ------------------------ ##
-AM_INIT_AUTOMAKE([1.9b subdir-objects dist-bzip2 gnits])
+AM_INIT_AUTOMAKE([1.10a subdir-objects dist-bzip2 gnits])
 
 
 
Index: ltdl/m4/gnulib-cache.m4
===================================================================
RCS file: /sources/m4/m4/ltdl/m4/gnulib-cache.m4,v
retrieving revision 1.14
diff -u -r1.14 gnulib-cache.m4
--- ltdl/m4/gnulib-cache.m4     6 Oct 2006 18:24:31 -0000       1.14
+++ ltdl/m4/gnulib-cache.m4     16 Oct 2006 21:31:07 -0000
@@ -15,11 +15,11 @@
 
 
 # Specification in the form of a command-line invocation:
-#   gnulib-tool --import --dir=. --lib=libgnu --source-base=gnu --m4-
base=ltdl/m4 --doc-base=doc --aux-dir=ltdl/config --libtool --macro-prefix=M4 
assert binary-io clean-temp cloexec close-stream closeout dirname error exit 
fdl filenamecat fopen-safer free gendocs gettext gnupload mkstemp obstack 
progname regex regexprops-generic stdbool stdlib-safer strnlen strtol unlocked-
io verror xalloc xalloc-die xstrndup xstrtol xvasprintf
+#   gnulib-tool --import --dir=. --lib=libgnu --source-base=gnu --m4-
base=ltdl/m4 --doc-base=doc --aux-dir=ltdl/config --libtool --macro-prefix=M4 
assert binary-io clean-temp cloexec close-stream closeout configmake dirname 
error exit fdl filenamecat fopen-safer free gendocs gettext gnupload mkstemp 
obstack progname regex regexprops-generic stdbool stdlib-safer strnlen strtol 
unlocked-io verror xalloc xalloc-die xstrndup xstrtol xvasprintf
 
 # Specification in the form of a few gnulib-tool.m4 macro invocations:
 gl_LOCAL_DIR([])
-gl_MODULES([assert binary-io clean-temp cloexec close-stream closeout dirname 
error exit fdl filenamecat fopen-safer free gendocs gettext gnupload mkstemp 
obstack progname regex regexprops-generic stdbool stdlib-safer strnlen strtol 
unlocked-io verror xalloc xalloc-die xstrndup xstrtol xvasprintf])
+gl_MODULES([assert binary-io clean-temp cloexec close-stream closeout 
configmake dirname error exit fdl filenamecat fopen-safer free gendocs gettext 
gnupload mkstemp obstack progname regex regexprops-generic stdbool stdlib-safer 
strnlen strtol unlocked-io verror xalloc xalloc-die xstrndup xstrtol 
xvasprintf])
 gl_AVOID([])
 gl_SOURCE_BASE([gnu])
 gl_M4_BASE([ltdl/m4])
Index: m4/module.c
===================================================================
RCS file: /sources/m4/m4/m4/module.c,v
retrieving revision 1.46
diff -u -r1.46 module.c
--- m4/module.c 27 Sep 2006 12:24:53 -0000      1.46
+++ m4/module.c 16 Oct 2006 21:31:07 -0000
@@ -18,7 +18,7 @@
    02110-1301  USA
 */
 
-#include "pathconf.h"
+#include "configmake.h"
 #include "ltdl.h"
 #include "m4private.h"
 #include "xvasprintf.h"
@@ -341,7 +341,7 @@
     }
 
   if (!errors)
-    errors = lt_dlsetsearchpath (MODULE_PATH);
+    errors = lt_dlsetsearchpath (PKGLIBEXECDIR);
 
   /* If the user set M4MODPATH, then use that as the start of the module
      search path.  */
Index: m4/symtab.c
===================================================================
RCS file: /sources/m4/m4/m4/symtab.c,v
retrieving revision 1.64
diff -u -r1.64 symtab.c
--- m4/symtab.c 13 Oct 2006 16:46:47 -0000      1.64
+++ m4/symtab.c 16 Oct 2006 21:31:07 -0000
@@ -580,7 +580,7 @@
   return xzalloc (sizeof (m4_symbol_value));
 }
 
-#undef m4_symbol_groks_macro
+#undef m4_symbol_value_groks_macro
 bool
 m4_symbol_value_groks_macro (m4_symbol_value *value)
 {
Index: src/main.c
===================================================================
RCS file: /sources/m4/m4/src/main.c,v
retrieving revision 1.97
diff -u -r1.97 main.c
--- src/main.c  13 Oct 2006 16:46:47 -0000      1.97
+++ src/main.c  16 Oct 2006 21:31:07 -0000
@@ -21,10 +21,11 @@
 
 #include "m4.h"
 #include "m4private.h"
+
 #include "closeout.h"
+#include "configmake.h"
 #include "getopt.h"
 #include "version-etc.h"
-#include "pathconf.h"
 #include "xstrtol.h"
 
 #include <limits.h>
@@ -104,7 +105,7 @@
   -M, --module-directory=DIR   add DIR to module search path before\n\
                                `%s'\n\
   -m, --load-module=MODULE     load dynamic MODULE\n\
-"), MODULE_PATH);
+"), PKGLIBEXECDIR);
       fputs (_("\
 \n\
 Preprocessor features:\n\
@@ -159,7 +160,7 @@
 \n\
 If defined, the environment variable `M4PATH' is a colon-separated list\n\
 of directories included after any specified by `-I', and the variable\n\
-`M4MODPATH' is a colon-separated list of directories searched after any\n\
+`M4MODPATH' is a colon-separated list of directories searched before any\n\
 specified by `-M'.\n\
 "), stdout);
       fputs (_("\