* configure.ac: Don't postprocess Makefile in config.status.

	Substitute GDB_NM_FILE.  Don't substitute nm_h.
	* Makefile.in (GDB_NM_FILE): Substitute.
	(TAGS): Use $(GDB_NM_FILE) instead of $(NAT_FILE).
	* configure: Regenerate.
	* gnulib/Makefile.in: Regenerate.

1 files changed, 48 insertions, 52 deletions

diff --git a/gdb/gnulib/Makefile.in b/gdb/gnulib/Makefile.in
index a185930..5e55573 100644
--- a/gdb/gnulib/Makefile.in
+++ b/gdb/gnulib/Makefile.in
@@ -1,8 +1,8 @@
 # Makefile.in generated by automake 1.9.6 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003,
-# 2004, 2005, 2009 Free Software Foundation, Inc.
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -14,7 +14,7 @@
 
 @SET_MAKE@
 
-# Copyright (C) 2004-2007 Free Software Foundation, Inc.
+# Copyright (C) 2004-2007, 2009 Free Software Foundation, Inc.
 #
 # This file is free software, distributed under the terms of the GNU
 # General Public License.  As a special exception to the GNU General
@@ -65,14 +65,21 @@ am__aclocal_m4_deps = $(top_srcdir)/gnulib/m4/extensions.m4 \
 	$(top_srcdir)/gnulib/m4/onceonly_2_57.m4 \
 	$(top_srcdir)/gnulib/m4/stdint.m4 \
 	$(top_srcdir)/gnulib/m4/string_h.m4 \
-	$(top_srcdir)/gnulib/m4/wchar.m4 $(top_srcdir)/acinclude.m4 \
-	$(top_srcdir)/../bfd/bfd.m4 \
+	$(top_srcdir)/gnulib/m4/wchar.m4 \
+	$(top_srcdir)/../config/extensions.m4 \
+	$(top_srcdir)/../config/lead-dot.m4 \
+	$(top_srcdir)/../config/proginstall.m4 \
+	$(top_srcdir)/acinclude.m4 $(top_srcdir)/../bfd/bfd.m4 \
 	$(top_srcdir)/../config/acinclude.m4 \
-	$(top_srcdir)/../config/stdint.m4 \
+	$(top_srcdir)/../config/override.m4 \
 	$(top_srcdir)/../config/gettext-sister.m4 \
 	$(top_srcdir)/../config/lib-ld.m4 \
 	$(top_srcdir)/../config/lib-prefix.m4 \
-	$(top_srcdir)/../config/lib-link.m4 $(top_srcdir)/configure.ac
+	$(top_srcdir)/../config/lib-link.m4 \
+	$(top_srcdir)/../config/acx.m4 $(top_srcdir)/../config/tcl.m4 \
+	$(top_srcdir)/../config/depstand.m4 \
+	$(top_srcdir)/../config/lcmessage.m4 \
+	$(top_srcdir)/../config/codeset.m4 $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(SHELL) $(top_srcdir)/../mkinstalldirs
@@ -142,9 +149,12 @@ EXEEXT = @EXEEXT@
 GDBTKLIBS = @GDBTKLIBS@
 GDBTK_CFLAGS = @GDBTK_CFLAGS@
 GDBTK_SRC_DIR = @GDBTK_SRC_DIR@
+GDB_NM_FILE = @GDB_NM_FILE@
 GENCAT = @GENCAT@
 GL_COND_LIBTOOL_FALSE = @GL_COND_LIBTOOL_FALSE@
 GL_COND_LIBTOOL_TRUE = @GL_COND_LIBTOOL_TRUE@
+GMAKE_FALSE = @GMAKE_FALSE@
+GMAKE_TRUE = @GMAKE_TRUE@
 GMSGFMT = @GMSGFMT@
 GNULIB_MBSCASECMP = @GNULIB_MBSCASECMP@
 GNULIB_MBSCASESTR = @GNULIB_MBSCASESTR@
@@ -163,6 +173,7 @@ GNULIB_MBSTOK_R = @GNULIB_MBSTOK_R@
 GNULIB_MEMMEM = @GNULIB_MEMMEM@
 GNULIB_MEMPCPY = @GNULIB_MEMPCPY@
 GNULIB_MEMRCHR = @GNULIB_MEMRCHR@
+GNULIB_STDINT_H = @GNULIB_STDINT_H@
 GNULIB_STPCPY = @GNULIB_STPCPY@
 GNULIB_STPNCPY = @GNULIB_STPNCPY@
 GNULIB_STRCASESTR = @GNULIB_STRCASESTR@
@@ -177,7 +188,6 @@ GNULIB_STRSIGNAL = @GNULIB_STRSIGNAL@
 GNULIB_STRSTR = @GNULIB_STRSTR@
 GNULIB_STRTOK_R = @GNULIB_STRTOK_R@
 GNULIB_WCWIDTH = @GNULIB_WCWIDTH@
-GREP = @GREP@
 GUI_CFLAGS_X = @GUI_CFLAGS_X@
 HAVE_DECL_MEMMEM = @HAVE_DECL_MEMMEM@
 HAVE_DECL_MEMRCHR = @HAVE_DECL_MEMRCHR@
@@ -215,28 +225,11 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 INSTOBJEXT = @INSTOBJEXT@
-ITCLHDIR = @ITCLHDIR@
-ITCLLIB = @ITCLLIB@
-ITCL_BUILD_INCLUDES = @ITCL_BUILD_INCLUDES@
-ITCL_BUILD_LIB_SPEC = @ITCL_BUILD_LIB_SPEC@
-ITCL_DEFS = @ITCL_DEFS@
-ITCL_DEPS = @ITCL_DEPS@
-ITCL_LIB_SPEC = @ITCL_LIB_SPEC@
-ITCL_VERSION = @ITCL_VERSION@
-ITKHDIR = @ITKHDIR@
-ITKLIB = @ITKLIB@
-ITK_BUILD_INCLUDES = @ITK_BUILD_INCLUDES@
-ITK_BUILD_LIB_SPEC = @ITK_BUILD_LIB_SPEC@
-ITK_DEFS = @ITK_DEFS@
-ITK_DEPS = @ITK_DEPS@
-ITK_LIB_SPEC = @ITK_LIB_SPEC@
-ITK_VERSION = @ITK_VERSION@
 LDFLAGS = @LDFLAGS@
 LIBEXPAT = @LIBEXPAT@
 LIBGNU_LIBDEPS = @LIBGNU_LIBDEPS@
 LIBGNU_LTLIBDEPS = @LIBGNU_LTLIBDEPS@
 LIBGUI = @LIBGUI@
-LIBICONV = @LIBICONV@
 LIBINTL = @LIBINTL@
 LIBINTL_DEP = @LIBINTL_DEP@
 LIBOBJS = @LIBOBJS@
@@ -247,6 +240,7 @@ LTLIBOBJS = @LTLIBOBJS@
 MAINT = @MAINT@
 MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
 MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
+MAKE = @MAKE@
 MAKEINFO = @MAKEINFO@
 MIG = @MIG@
 NEXT_STDINT_H = @NEXT_STDINT_H@
@@ -260,9 +254,11 @@ PACKAGE_STRING = @PACKAGE_STRING@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
+PKGVERSION = @PKGVERSION@
 POSUB = @POSUB@
 PROFILE_CFLAGS = @PROFILE_CFLAGS@
 PTRDIFF_T_SUFFIX = @PTRDIFF_T_SUFFIX@
+PYTHON_CFLAGS = @PYTHON_CFLAGS@
 RANLIB = @RANLIB@
 READLINE = @READLINE@
 READLINE_CFLAGS = @READLINE_CFLAGS@
@@ -273,6 +269,8 @@ REPLACE_STRERROR = @REPLACE_STRERROR@
 REPLACE_STRSIGNAL = @REPLACE_STRSIGNAL@
 REPLACE_STRSTR = @REPLACE_STRSTR@
 REPLACE_WCWIDTH = @REPLACE_WCWIDTH@
+REPORT_BUGS_TEXI = @REPORT_BUGS_TEXI@
+REPORT_BUGS_TO = @REPORT_BUGS_TO@
 SER_HARDWIRE = @SER_HARDWIRE@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
@@ -285,35 +283,32 @@ STRIP = @STRIP@
 TARGET_OBS = @TARGET_OBS@
 TARGET_SYSTEM_ROOT = @TARGET_SYSTEM_ROOT@
 TARGET_SYSTEM_ROOT_DEFINE = @TARGET_SYSTEM_ROOT_DEFINE@
-TCLHDIR = @TCLHDIR@
-TCL_BUILD_LIB_SPEC = @TCL_BUILD_LIB_SPEC@
-TCL_CC = @TCL_CC@
-TCL_CC_SEARCH_FLAGS = @TCL_CC_SEARCH_FLAGS@
-TCL_COMPAT_OBJS = @TCL_COMPAT_OBJS@
-TCL_DEFS = @TCL_DEFS@
+TCL_BIN_DIR = @TCL_BIN_DIR@
 TCL_DEPS = @TCL_DEPS@
-TCL_DL_LIBS = @TCL_DL_LIBS@
-TCL_LD_FLAGS = @TCL_LD_FLAGS@
-TCL_LD_SEARCH_FLAGS = @TCL_LD_SEARCH_FLAGS@
+TCL_INCLUDE = @TCL_INCLUDE@
+TCL_LIBRARY = @TCL_LIBRARY@
+TCL_LIB_FILE = @TCL_LIB_FILE@
+TCL_LIB_FLAG = @TCL_LIB_FLAG@
 TCL_LIB_SPEC = @TCL_LIB_SPEC@
-TCL_LIB_VERSIONS_OK = @TCL_LIB_VERSIONS_OK@
-TCL_MAJOR_VERSION = @TCL_MAJOR_VERSION@
-TCL_MINOR_VERSION = @TCL_MINOR_VERSION@
-TCL_RANLIB = @TCL_RANLIB@
-TCL_SHLIB_CFLAGS = @TCL_SHLIB_CFLAGS@
-TCL_SHLIB_LD = @TCL_SHLIB_LD@
-TCL_SHLIB_LD_LIBS = @TCL_SHLIB_LD_LIBS@
-TCL_SHLIB_SUFFIX = @TCL_SHLIB_SUFFIX@
+TCL_PATCH_LEVEL = @TCL_PATCH_LEVEL@
+TCL_SRC_DIR = @TCL_SRC_DIR@
+TCL_STUB_LIB_FILE = @TCL_STUB_LIB_FILE@
+TCL_STUB_LIB_FLAG = @TCL_STUB_LIB_FLAG@
+TCL_STUB_LIB_SPEC = @TCL_STUB_LIB_SPEC@
 TCL_VERSION = @TCL_VERSION@
-TKHDIR = @TKHDIR@
-TK_BUILD_INCLUDES = @TK_BUILD_INCLUDES@
-TK_BUILD_LIB_SPEC = @TK_BUILD_LIB_SPEC@
-TK_DEFS = @TK_DEFS@
+TK_BIN_DIR = @TK_BIN_DIR@
 TK_DEPS = @TK_DEPS@
+TK_INCLUDE = @TK_INCLUDE@
+TK_LIBRARY = @TK_LIBRARY@
+TK_LIB_FILE = @TK_LIB_FILE@
+TK_LIB_FLAG = @TK_LIB_FLAG@
 TK_LIB_SPEC = @TK_LIB_SPEC@
+TK_SRC_DIR = @TK_SRC_DIR@
+TK_STUB_LIB_FILE = @TK_STUB_LIB_FILE@
+TK_STUB_LIB_FLAG = @TK_STUB_LIB_FLAG@
+TK_STUB_LIB_SPEC = @TK_STUB_LIB_SPEC@
 TK_VERSION = @TK_VERSION@
 TK_XINCLUDES = @TK_XINCLUDES@
-TK_XLIBSW = @TK_XLIBSW@
 USE_NLS = @USE_NLS@
 VERSION = @VERSION@
 WARN_CFLAGS = @WARN_CFLAGS@
@@ -325,13 +320,17 @@ WIN32LIBS = @WIN32LIBS@
 WINDRES = @WINDRES@
 WINT_T_SUFFIX = @WINT_T_SUFFIX@
 XGETTEXT = @XGETTEXT@
-XMKMF = @XMKMF@
 X_CFLAGS = @X_CFLAGS@
 X_LDFLAGS = @X_LDFLAGS@
 X_LIBS = @X_LIBS@
 YACC = @YACC@
-YFLAGS = @YFLAGS@
+ac_ct_AR = @ac_ct_AR@
 ac_ct_CC = @ac_ct_CC@
+ac_ct_DLLTOOL = @ac_ct_DLLTOOL@
+ac_ct_MIG = @ac_ct_MIG@
+ac_ct_RANLIB = @ac_ct_RANLIB@
+ac_ct_STRIP = @ac_ct_STRIP@
+ac_ct_WINDRES = @ac_ct_WINDRES@
 am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
 am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
 am__include = @am__include@
@@ -348,7 +347,6 @@ build_vendor = @build_vendor@
 datadir = @datadir@
 datarootdir = @datarootdir@
 docdir = @docdir@
-dvidir = @dvidir@
 exec_prefix = @exec_prefix@
 frags = @frags@
 gl_LIBOBJS = @gl_LIBOBJS@
@@ -370,12 +368,10 @@ localedir = @localedir@
 localstatedir = @localstatedir@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
-nm_h = @nm_h@
 oldincludedir = @oldincludedir@
 pdfdir = @pdfdir@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
-psdir = @psdir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 subdirs = @subdirs@