--enable-debug build

[Eric Blake]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Ever since I moved some of the modules to the tests dir, ./configure
- --enable-debug has been broken.  This fixes things.

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

        * modules/m4.c (m4_make_temp): Make safe across libtool.
        * m4/symtab.c (dump_symbol_CB) [DEBUG_SYM]: Avoid warnings.
        * configure.ac (--with-modules): Accomodate changed module
        location when doing './configure --enable-debug'.

- --
Life is short - so eat dessert first!

Eric Blake             address@hidden
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.5 (Cygwin)
Comment: Public key at home.comcast.net/~ericblake/eblake.gpg
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org

iD8DBQFFRq9o84KuGfSFAYARAm/QAJ9PdwHqcWqblat3jHuR3iwvZBBnGACgiA20
jzMp0BclWAqFeud/F4TbL10=
=EbJR
-----END PGP SIGNATURE-----

Index: configure.ac
===================================================================
RCS file: /sources/m4/m4/configure.ac,v
retrieving revision 1.60
diff -u -p -r1.60 configure.ac
--- configure.ac        27 Oct 2006 21:10:15 -0000      1.60
+++ configure.ac        31 Oct 2006 02:04:27 -0000
@@ -124,8 +124,15 @@ AC_MSG_CHECKING([for modules to preload]
   else
     if test "$use_modules" != yes; then
       for module in $use_modules; do
-       DLPREOPEN="$DLPREOPEN -dlpreopen modules/$module.la"
-       PREOPEN_DEPENDENCIES="$PREOPEN_DEPENDENCIES modules/$module.la"
+       case $module in
+         no|none) break ;;
+         m4|traditional|gnu|load|mpeval) dir=modules ;;
+         import|modtest|shadow|stdlib|time) dir=tests ;;
+         *) AC_MSG_ERROR([Unrecognized module `$module' in --with-modules])
+           ;;
+       esac
+       DLPREOPEN="$DLPREOPEN -dlpreopen $dir/$module.la"
+       PREOPEN_DEPENDENCIES="$PREOPEN_DEPENDENCIES $dir/$module.la"
       done
     fi
   fi
Index: m4/symtab.c
===================================================================
RCS file: /sources/m4/m4/m4/symtab.c,v
retrieving revision 1.67
diff -u -p -r1.67 symtab.c
--- m4/symtab.c 27 Oct 2006 17:03:51 -0000      1.67
+++ m4/symtab.c 31 Oct 2006 02:04:27 -0000
@@ -718,7 +718,6 @@ dump_symbol_CB (m4_symbol_table *symtab,
   int             flags        = value ? SYMBOL_FLAGS (symbol) : 0;
   lt_dlhandle      handle      = value ? SYMBOL_HANDLE (symbol) : 0;
   const char *     module_name = handle ? m4_get_module_name (handle) : "NONE";
-  const m4_builtin *bp;
 
   fprintf (stderr, "%10s: (%d%s) %s=", module_name, flags,
           m4_get_symbol_traced (symbol) ? "!" : "", name);
@@ -732,7 +731,7 @@ dump_symbol_CB (m4_symbol_table *symtab,
       m4_obstack obs;
       obstack_init (&obs);
       m4_symbol_value_print (value, &obs, false, NULL, NULL, 0, true);
-      fprintf (stderr, "%s", obstack_finish (&obs));
+      fprintf (stderr, "%s", (char *) obstack_finish (&obs));
       obstack_free (&obs, NULL);
     }
   fputc ('\n', stderr);
Index: modules/m4.c
===================================================================
RCS file: /sources/m4/m4/modules/m4.c,v
retrieving revision 1.88
diff -u -p -r1.88 m4.c
--- modules/m4.c        27 Oct 2006 15:16:31 -0000      1.88
+++ modules/m4.c        31 Oct 2006 02:04:28 -0000
@@ -49,6 +49,7 @@
 #define m4_sysval_flush                m4_LTX_m4_sysval_flush
 #define m4_dump_symbols                m4_LTX_m4_dump_symbols
 #define m4_expand_ranges       m4_LTX_m4_expand_ranges
+#define m4_make_temp           m4_LTX_m4_make_temp
 
 extern void m4_set_sysval    (int value);
 extern void m4_sysval_flush  (m4 *context);