2012-04-19 Pedro Alves <palves@redhat.com>

	gdb/
	* Makefile.in (GNULIB_BUILDDIR): New.
	(LIBGNU, INCGNU, GNULIB_H): Adjust.
	(SUBDIRS): Add $(GNULIB_BUILDDIR).
	(CLEANDIRS). Remove gnulib/import.
	(REQUIRED_SUBDIRS): Replace gnulib/import with $(GNULIB_BUILDDIR).
	(all-lib): Ditto.
	(distclean): Remove the $(GNULIB_BUILDDIR) directory.
	(gnulib/import/Makefile): Replace gnulib/import with
	$(GNULIB_BUILDDIR).  Set CONFIG_FILES to just Makefile.
	(ACLOCAL_AMFLAGS): Remove '-I gnulib/import/m4'.
	(aclocal_m4_deps): Remove the gnulib dependencies.  Add
	acx_configure_dir.m4.
	* acinclude.m4: Include acx_configure_dir.m4.
	* acx_configure_dir.m4: New file.
	* aclocal.m4: Regenerate.
        * configure.ac: Remove gl_EARLY, gl_INIT and AM_INIT_AUTOMAKE
        calls.  Configure gnulib using ACX_CONFIGURE_DIR.
        (GNULIB): New variable.
        (GNULIB_STDINT_H): Adjust.
        (AC_OUTPUT): Don't output gnulib/Makefile.
        * gdb/defs.h: Include build-gnulib/config.h.
        * aclocal.m4: Regenerate.
        * config.in: Regenerate.
        * configure: Regenerate.

        * gnulib/Makefile.in: New file.
        * gnulib/configure.ac: New file.
        * gnulib/aclocal.m4: New file.
        * gnulib/config.in: New file.
        * gnulib/configure: New file.
	* gnulib/: Re-run gnulib-tool to adjust.

        gdb/gdbserver/
        * Makefile.in (GNULIB_BUILDDIR): New.
	(LIBGNU, INCGNU, GNULIB_H): Adjust.
        (SUBDIRS, CLEANDIRS, REQUIRED_SUBDIRS): New.
        (all, install-only, uninstall, clean-info, all-lib, clean): No
        longer pass GNULIB_FLAGS_TO_PASS.  Use subdir_do.
        (maintainer-clean realclean distclean): Use subdir_do.
        (subdir_do): New.
        (gnulib/import/Makefile): Adjust.  Replace gnulib/import with
	$(GNULIB_BUILDDIR).  Don't pass argument to config.status.
        * acinclude.m4: Include acx_configure_dir.m4.
        * configure.ac: Remove gl_EARLY, gl_INIT, and AM_INIT_AUTOMAKE
        calls.  Call AC_PROG_RANLIB.  Configure gnulib using
        ACX_CONFIGURE_DIR.
        (GNULIB): New.
        (GNULIB_STDINT_H): Adjust.
        (AC_OUTPUT): Don't output gnulib/Makefile anymore.
        * gdbreplay.c: Include build-gnulib/config.h.
        * server.h: Likewise.
        * aclocal.m4: Regenerate.
        * config.in: Regenerate.
        * configure: Regenerate.

4 files changed, 52 insertions, 168 deletions

diff --git a/gdb/gnulib/import/Makefile.am b/gdb/gnulib/import/Makefile.am
index c50c5820ef9..5ca3689a0b6 100644
--- a/gdb/gnulib/import/Makefile.am
+++ b/gdb/gnulib/import/Makefile.am
@@ -21,7 +21,7 @@
 # the same distribution terms as the rest of that program.
 #
 # Generated by gnulib-tool.
-# Reproduce by: gnulib-tool --import --dir=. --lib=libgnu --source-base=gnulib/import --m4-base=gnulib/import/m4 --doc-base=doc --tests-base=tests --aux-dir=gnulib/import/extra --no-conditional-dependencies --no-libtool --macro-prefix=gl --no-vc-files inttypes memmem update-copyright
+# Reproduce by: gnulib-tool --import --dir=. --lib=libgnu --source-base=import --m4-base=import/m4 --doc-base=doc --tests-base=tests --aux-dir=import/extra --no-conditional-dependencies --no-libtool --macro-prefix=gl --no-vc-files inttypes memmem update-copyright
 
 AUTOMAKE_OPTIONS = 1.5 gnits
 
@@ -122,17 +122,17 @@ BUILT_SOURCES += arg-nonnull.h
 # The arg-nonnull.h that gets inserted into generated .h files is the same as
 # build-aux/snippet/arg-nonnull.h, except that it has the copyright header cut
 # off.
-arg-nonnull.h: $(top_srcdir)/gnulib/import/extra/snippet/arg-nonnull.h
+arg-nonnull.h: $(top_srcdir)/import/extra/snippet/arg-nonnull.h
 	$(AM_V_GEN)rm -f $@-t $@ && \
 	sed -n -e '/GL_ARG_NONNULL/,$$p' \
-	  < $(top_srcdir)/gnulib/import/extra/snippet/arg-nonnull.h \
+	  < $(top_srcdir)/import/extra/snippet/arg-nonnull.h \
 	  > $@-t && \
 	mv $@-t $@
 MOSTLYCLEANFILES += arg-nonnull.h arg-nonnull.h-t
 
 ARG_NONNULL_H=arg-nonnull.h
 
-EXTRA_DIST += $(top_srcdir)/gnulib/import/extra/snippet/arg-nonnull.h
+EXTRA_DIST += $(top_srcdir)/import/extra/snippet/arg-nonnull.h
 
 ## end   gnulib module snippet/arg-nonnull
 
@@ -146,17 +146,17 @@ EXTRA_DIST += $(top_srcdir)/gnulib/import/extra/snippet/arg-nonnull.h
 BUILT_SOURCES += c++defs.h
 # The c++defs.h that gets inserted into generated .h files is the same as
 # build-aux/snippet/c++defs.h, except that it has the copyright header cut off.
-c++defs.h: $(top_srcdir)/gnulib/import/extra/snippet/c++defs.h
+c++defs.h: $(top_srcdir)/import/extra/snippet/c++defs.h
 	$(AM_V_GEN)rm -f $@-t $@ && \
 	sed -n -e '/_GL_CXXDEFS/,$$p' \
-	  < $(top_srcdir)/gnulib/import/extra/snippet/c++defs.h \
+	  < $(top_srcdir)/import/extra/snippet/c++defs.h \
 	  > $@-t && \
 	mv $@-t $@
 MOSTLYCLEANFILES += c++defs.h c++defs.h-t
 
 CXXDEFS_H=c++defs.h
 
-EXTRA_DIST += $(top_srcdir)/gnulib/import/extra/snippet/c++defs.h
+EXTRA_DIST += $(top_srcdir)/import/extra/snippet/c++defs.h
 
 ## end   gnulib module snippet/c++defs
 
@@ -166,17 +166,17 @@ BUILT_SOURCES += warn-on-use.h
 # The warn-on-use.h that gets inserted into generated .h files is the same as
 # build-aux/snippet/warn-on-use.h, except that it has the copyright header cut
 # off.
-warn-on-use.h: $(top_srcdir)/gnulib/import/extra/snippet/warn-on-use.h
+warn-on-use.h: $(top_srcdir)/import/extra/snippet/warn-on-use.h
 	$(AM_V_GEN)rm -f $@-t $@ && \
 	sed -n -e '/^.ifndef/,$$p' \
-	  < $(top_srcdir)/gnulib/import/extra/snippet/warn-on-use.h \
+	  < $(top_srcdir)/import/extra/snippet/warn-on-use.h \
 	  > $@-t && \
 	mv $@-t $@
 MOSTLYCLEANFILES += warn-on-use.h warn-on-use.h-t
 
 WARN_ON_USE_H=warn-on-use.h
 
-EXTRA_DIST += $(top_srcdir)/gnulib/import/extra/snippet/warn-on-use.h
+EXTRA_DIST += $(top_srcdir)/import/extra/snippet/warn-on-use.h
 
 ## end   gnulib module snippet/warn-on-use
 
@@ -363,7 +363,7 @@ EXTRA_DIST += string.in.h
 ## begin gnulib module update-copyright
 
 
-EXTRA_DIST += $(top_srcdir)/gnulib/import/extra/update-copyright
+EXTRA_DIST += $(top_srcdir)/import/extra/update-copyright
 
 ## end   gnulib module update-copyright
 
diff --git a/gdb/gnulib/import/Makefile.in b/gdb/gnulib/import/Makefile.in
index 206725d0c92..63dd1e007eb 100644
--- a/gdb/gnulib/import/Makefile.in
+++ b/gdb/gnulib/import/Makefile.in
@@ -36,7 +36,7 @@
 # the same distribution terms as the rest of that program.
 #
 # Generated by gnulib-tool.
-# Reproduce by: gnulib-tool --import --dir=. --lib=libgnu --source-base=gnulib/import --m4-base=gnulib/import/m4 --doc-base=doc --tests-base=tests --aux-dir=gnulib/import/extra --no-conditional-dependencies --no-libtool --macro-prefix=gl --no-vc-files inttypes memmem update-copyright
+# Reproduce by: gnulib-tool --import --dir=. --lib=libgnu --source-base=import --m4-base=import/m4 --doc-base=doc --tests-base=tests --aux-dir=import/extra --no-conditional-dependencies --no-libtool --macro-prefix=gl --no-vc-files inttypes memmem update-copyright
 
 
 
@@ -60,46 +60,31 @@ POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
 target_triplet = @target@
-subdir = gnulib/import
+subdir = import
 DIST_COMMON = $(noinst_HEADERS) $(srcdir)/Makefile.am \
 	$(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/../config/largefile.m4 \
-	$(top_srcdir)/../config/lead-dot.m4 \
-	$(top_srcdir)/../config/plugins.m4 \
-	$(top_srcdir)/gnulib/import/m4/00gnulib.m4 \
-	$(top_srcdir)/gnulib/import/m4/extensions.m4 \
-	$(top_srcdir)/gnulib/import/m4/gnulib-common.m4 \
-	$(top_srcdir)/gnulib/import/m4/gnulib-comp.m4 \
-	$(top_srcdir)/gnulib/import/m4/include_next.m4 \
-	$(top_srcdir)/gnulib/import/m4/inttypes-pri.m4 \
-	$(top_srcdir)/gnulib/import/m4/inttypes.m4 \
-	$(top_srcdir)/gnulib/import/m4/longlong.m4 \
-	$(top_srcdir)/gnulib/import/m4/memchr.m4 \
-	$(top_srcdir)/gnulib/import/m4/memmem.m4 \
-	$(top_srcdir)/gnulib/import/m4/mmap-anon.m4 \
-	$(top_srcdir)/gnulib/import/m4/multiarch.m4 \
-	$(top_srcdir)/gnulib/import/m4/onceonly.m4 \
-	$(top_srcdir)/gnulib/import/m4/stddef_h.m4 \
-	$(top_srcdir)/gnulib/import/m4/stdint.m4 \
-	$(top_srcdir)/gnulib/import/m4/string_h.m4 \
-	$(top_srcdir)/gnulib/import/m4/warn-on-use.m4 \
-	$(top_srcdir)/gnulib/import/m4/wchar_t.m4 \
-	$(top_srcdir)/acinclude.m4 $(top_srcdir)/../bfd/bfd.m4 \
-	$(top_srcdir)/../config/acinclude.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)/../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)/../config/zlib.m4 $(top_srcdir)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/import/m4/00gnulib.m4 \
+	$(top_srcdir)/import/m4/extensions.m4 \
+	$(top_srcdir)/import/m4/gnulib-common.m4 \
+	$(top_srcdir)/import/m4/gnulib-comp.m4 \
+	$(top_srcdir)/import/m4/include_next.m4 \
+	$(top_srcdir)/import/m4/inttypes-pri.m4 \
+	$(top_srcdir)/import/m4/inttypes.m4 \
+	$(top_srcdir)/import/m4/longlong.m4 \
+	$(top_srcdir)/import/m4/memchr.m4 \
+	$(top_srcdir)/import/m4/memmem.m4 \
+	$(top_srcdir)/import/m4/mmap-anon.m4 \
+	$(top_srcdir)/import/m4/multiarch.m4 \
+	$(top_srcdir)/import/m4/onceonly.m4 \
+	$(top_srcdir)/import/m4/stddef_h.m4 \
+	$(top_srcdir)/import/m4/stdint.m4 \
+	$(top_srcdir)/import/m4/string_h.m4 \
+	$(top_srcdir)/import/m4/warn-on-use.m4 \
+	$(top_srcdir)/import/m4/wchar_t.m4 $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
-mkinstalldirs = $(SHELL) $(top_srcdir)/../mkinstalldirs
+mkinstalldirs = $(SHELL) $(top_srcdir)/../../mkinstalldirs
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
 CONFIG_CLEAN_VPATH_FILES =
@@ -110,7 +95,7 @@ am_libgnu_a_OBJECTS = dummy.$(OBJEXT)
 libgnu_a_OBJECTS = $(am_libgnu_a_OBJECTS)
 LTLIBRARIES = $(noinst_LTLIBRARIES)
 DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
-depcomp = $(SHELL) $(top_srcdir)/../depcomp
+depcomp = $(SHELL) $(top_srcdir)/../../depcomp
 am__depfiles_maybe = depfiles
 am__mv = mv -f
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
@@ -162,7 +147,6 @@ am__relativize = \
   done; \
   reldir="$$dir2"
 ACLOCAL = @ACLOCAL@
-ALLOCA = @ALLOCA@
 AMTAR = @AMTAR@
 APPLE_UNIVERSAL_BUILD = @APPLE_UNIVERSAL_BUILD@
 AR = @AR@
@@ -176,40 +160,19 @@ BITSIZEOF_SIG_ATOMIC_T = @BITSIZEOF_SIG_ATOMIC_T@
 BITSIZEOF_SIZE_T = @BITSIZEOF_SIZE_T@
 BITSIZEOF_WCHAR_T = @BITSIZEOF_WCHAR_T@
 BITSIZEOF_WINT_T = @BITSIZEOF_WINT_T@
-CATALOGS = @CATALOGS@
-CATOBJEXT = @CATOBJEXT@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
-CONFIG_ALL = @CONFIG_ALL@
-CONFIG_CLEAN = @CONFIG_CLEAN@
-CONFIG_DEPS = @CONFIG_DEPS@
-CONFIG_INSTALL = @CONFIG_INSTALL@
-CONFIG_LDFLAGS = @CONFIG_LDFLAGS@
-CONFIG_OBS = @CONFIG_OBS@
-CONFIG_SRCS = @CONFIG_SRCS@
-CONFIG_UNINSTALL = @CONFIG_UNINSTALL@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CYGPATH_W = @CYGPATH_W@
-DATADIRNAME = @DATADIRNAME@
-DEBUGDIR = @DEBUGDIR@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
-DLLTOOL = @DLLTOOL@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
-ENABLE_CFLAGS = @ENABLE_CFLAGS@
 EXEEXT = @EXEEXT@
-GDBTKLIBS = @GDBTKLIBS@
-GDBTK_CFLAGS = @GDBTK_CFLAGS@
-GDBTK_SRC_DIR = @GDBTK_SRC_DIR@
-GDB_DATADIR = @GDB_DATADIR@
-GDB_NM_FILE = @GDB_NM_FILE@
-GENCAT = @GENCAT@
-GMSGFMT = @GMSGFMT@
 GNULIB_FFSL = @GNULIB_FFSL@
 GNULIB_FFSLL = @GNULIB_FFSLL@
 GNULIB_IMAXABS = @GNULIB_IMAXABS@
@@ -233,7 +196,6 @@ GNULIB_MEMMEM = @GNULIB_MEMMEM@
 GNULIB_MEMPCPY = @GNULIB_MEMPCPY@
 GNULIB_MEMRCHR = @GNULIB_MEMRCHR@
 GNULIB_RAWMEMCHR = @GNULIB_RAWMEMCHR@
-GNULIB_STDINT_H = @GNULIB_STDINT_H@
 GNULIB_STPCPY = @GNULIB_STPCPY@
 GNULIB_STPNCPY = @GNULIB_STPNCPY@
 GNULIB_STRCASESTR = @GNULIB_STRCASESTR@
@@ -253,7 +215,6 @@ GNULIB_STRTOK_R = @GNULIB_STRTOK_R@
 GNULIB_STRTOUMAX = @GNULIB_STRTOUMAX@
 GNULIB_STRVERSCMP = @GNULIB_STRVERSCMP@
 GREP = @GREP@
-GUI_CFLAGS_X = @GUI_CFLAGS_X@
 HAVE_DECL_IMAXABS = @HAVE_DECL_IMAXABS@
 HAVE_DECL_IMAXDIV = @HAVE_DECL_IMAXDIV@
 HAVE_DECL_MEMMEM = @HAVE_DECL_MEMMEM@
@@ -269,7 +230,6 @@ HAVE_DECL_STRTOUMAX = @HAVE_DECL_STRTOUMAX@
 HAVE_FFSL = @HAVE_FFSL@
 HAVE_FFSLL = @HAVE_FFSLL@
 HAVE_INTTYPES_H = @HAVE_INTTYPES_H@
-HAVE_LIBEXPAT = @HAVE_LIBEXPAT@
 HAVE_LONG_LONG_INT = @HAVE_LONG_LONG_INT@
 HAVE_MBSLEN = @HAVE_MBSLEN@
 HAVE_MEMCHR = @HAVE_MEMCHR@
@@ -292,7 +252,6 @@ HAVE_SYS_TYPES_H = @HAVE_SYS_TYPES_H@
 HAVE_UNSIGNED_LONG_LONG_INT = @HAVE_UNSIGNED_LONG_LONG_INT@
 HAVE_WCHAR_H = @HAVE_WCHAR_H@
 HAVE_WCHAR_T = @HAVE_WCHAR_T@
-INCINTL = @INCINTL@
 INCLUDE_NEXT = @INCLUDE_NEXT@
 INCLUDE_NEXT_AS_FIRST_DIRECTIVE = @INCLUDE_NEXT_AS_FIRST_DIRECTIVE@
 INSTALL = @INSTALL@
@@ -300,28 +259,17 @@ INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-INSTOBJEXT = @INSTOBJEXT@
 INT32_MAX_LT_INTMAX_MAX = @INT32_MAX_LT_INTMAX_MAX@
 INT64_MAX_EQ_LONG_MAX = @INT64_MAX_EQ_LONG_MAX@
-JIT_READER_DIR = @JIT_READER_DIR@
 LDFLAGS = @LDFLAGS@
-LIBEXPAT = @LIBEXPAT@
 LIBGNU_LIBDEPS = @LIBGNU_LIBDEPS@
 LIBGNU_LTLIBDEPS = @LIBGNU_LTLIBDEPS@
-LIBGUI = @LIBGUI@
-LIBINTL = @LIBINTL@
-LIBINTL_DEP = @LIBINTL_DEP@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LN_S = @LN_S@
-LTLIBEXPAT = @LTLIBEXPAT@
 LTLIBOBJS = @LTLIBOBJS@
 MAINT = @MAINT@
-MAKE = @MAKE@
 MAKEINFO = @MAKEINFO@
-MAKEINFOFLAGS = @MAKEINFOFLAGS@
-MAKEINFO_EXTRA_FLAGS = @MAKEINFO_EXTRA_FLAGS@
-MIG = @MIG@
 MKDIR_P = @MKDIR_P@
 NEXT_AS_FIRST_DIRECTIVE_INTTYPES_H = @NEXT_AS_FIRST_DIRECTIVE_INTTYPES_H@
 NEXT_AS_FIRST_DIRECTIVE_STDDEF_H = @NEXT_AS_FIRST_DIRECTIVE_STDDEF_H@
@@ -340,23 +288,12 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@
 PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
-PKGVERSION = @PKGVERSION@
-POSUB = @POSUB@
 PRAGMA_COLUMNS = @PRAGMA_COLUMNS@
 PRAGMA_SYSTEM_HEADER = @PRAGMA_SYSTEM_HEADER@
 PRIPTR_PREFIX = @PRIPTR_PREFIX@
 PRI_MACROS_BROKEN = @PRI_MACROS_BROKEN@
-PROFILE_CFLAGS = @PROFILE_CFLAGS@
 PTRDIFF_T_SUFFIX = @PTRDIFF_T_SUFFIX@
-PYTHON_CFLAGS = @PYTHON_CFLAGS@
-PYTHON_CPPFLAGS = @PYTHON_CPPFLAGS@
-PYTHON_LIBS = @PYTHON_LIBS@
 RANLIB = @RANLIB@
-RDYNAMIC = @RDYNAMIC@
-READLINE = @READLINE@
-READLINE_CFLAGS = @READLINE_CFLAGS@
-READLINE_DEPS = @READLINE_DEPS@
-READLINE_TEXI_INCFLAG = @READLINE_TEXI_INCFLAG@
 REPLACE_MEMCHR = @REPLACE_MEMCHR@
 REPLACE_MEMMEM = @REPLACE_MEMMEM@
 REPLACE_NULL = @REPLACE_NULL@
@@ -373,67 +310,19 @@ REPLACE_STRSIGNAL = @REPLACE_STRSIGNAL@
 REPLACE_STRSTR = @REPLACE_STRSTR@
 REPLACE_STRTOIMAX = @REPLACE_STRTOIMAX@
 REPLACE_STRTOK_R = @REPLACE_STRTOK_R@
-REPORT_BUGS_TEXI = @REPORT_BUGS_TEXI@
-REPORT_BUGS_TO = @REPORT_BUGS_TO@
-SER_HARDWIRE = @SER_HARDWIRE@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 SIG_ATOMIC_T_SUFFIX = @SIG_ATOMIC_T_SUFFIX@
-SIM = @SIM@
-SIM_OBS = @SIM_OBS@
 SIZE_T_SUFFIX = @SIZE_T_SUFFIX@
 STDDEF_H = @STDDEF_H@
 STDINT_H = @STDINT_H@
 STRIP = @STRIP@
-SYSTEM_GDBINIT = @SYSTEM_GDBINIT@
-TARGET_OBS = @TARGET_OBS@
-TARGET_PTR = @TARGET_PTR@
-TARGET_SYSTEM_ROOT = @TARGET_SYSTEM_ROOT@
-TCL_BIN_DIR = @TCL_BIN_DIR@
-TCL_DEPS = @TCL_DEPS@
-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_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@
-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@
 UINT32_MAX_LT_UINTMAX_MAX = @UINT32_MAX_LT_UINTMAX_MAX@
 UINT64_MAX_EQ_ULONG_MAX = @UINT64_MAX_EQ_ULONG_MAX@
 UNDEFINE_STRTOK_R = @UNDEFINE_STRTOK_R@
-USE_NLS = @USE_NLS@
 VERSION = @VERSION@
-WARN_CFLAGS = @WARN_CFLAGS@
 WCHAR_T_SUFFIX = @WCHAR_T_SUFFIX@
-WERROR_CFLAGS = @WERROR_CFLAGS@
-WIN32LDAPP = @WIN32LDAPP@
-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@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
@@ -456,7 +345,6 @@ datarootdir = @datarootdir@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
-frags = @frags@
 gl_LIBOBJS = @gl_LIBOBJS@
 gl_LTLIBOBJS = @gl_LTLIBOBJS@
 gltests_LIBOBJS = @gltests_LIBOBJS@
@@ -482,17 +370,14 @@ pdfdir = @pdfdir@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
-python_prog_path = @python_prog_path@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
-subdirs = @subdirs@
 sysconfdir = @sysconfdir@
 target = @target@
 target_alias = @target_alias@
 target_cpu = @target_cpu@
 target_os = @target_os@
-target_subdir = @target_subdir@
 target_vendor = @target_vendor@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
@@ -504,11 +389,11 @@ noinst_LIBRARIES = libgnu.a
 noinst_LTLIBRARIES = 
 EXTRA_DIST = m4/gnulib-cache.m4 inttypes.in.h memchr.c memchr.valgrind \
 	memmem.c str-two-way.h \
-	$(top_srcdir)/gnulib/import/extra/snippet/arg-nonnull.h \
-	$(top_srcdir)/gnulib/import/extra/snippet/c++defs.h \
-	$(top_srcdir)/gnulib/import/extra/snippet/warn-on-use.h \
-	stddef.in.h stdint.in.h string.in.h \
-	$(top_srcdir)/gnulib/import/extra/update-copyright
+	$(top_srcdir)/import/extra/snippet/arg-nonnull.h \
+	$(top_srcdir)/import/extra/snippet/c++defs.h \
+	$(top_srcdir)/import/extra/snippet/warn-on-use.h stddef.in.h \
+	stdint.in.h string.in.h \
+	$(top_srcdir)/import/extra/update-copyright
 
 # The BUILT_SOURCES created by this Makefile snippet are not used via #include
 # statements but through direct file reference. Therefore this snippet must be
@@ -553,9 +438,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__confi
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnits gnulib/import/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnits import/Makefile'; \
 	$(am__cd) $(top_srcdir) && \
-	  $(AUTOMAKE) --gnits gnulib/import/Makefile
+	  $(AUTOMAKE) --gnits import/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
@@ -973,27 +858,27 @@ inttypes.h: inttypes.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(WARN_ON_U
 # The arg-nonnull.h that gets inserted into generated .h files is the same as
 # build-aux/snippet/arg-nonnull.h, except that it has the copyright header cut
 # off.
-arg-nonnull.h: $(top_srcdir)/gnulib/import/extra/snippet/arg-nonnull.h
+arg-nonnull.h: $(top_srcdir)/import/extra/snippet/arg-nonnull.h
 	$(AM_V_GEN)rm -f $@-t $@ && \
 	sed -n -e '/GL_ARG_NONNULL/,$$p' \
-	  < $(top_srcdir)/gnulib/import/extra/snippet/arg-nonnull.h \
+	  < $(top_srcdir)/import/extra/snippet/arg-nonnull.h \
 	  > $@-t && \
 	mv $@-t $@
 # The c++defs.h that gets inserted into generated .h files is the same as
 # build-aux/snippet/c++defs.h, except that it has the copyright header cut off.
-c++defs.h: $(top_srcdir)/gnulib/import/extra/snippet/c++defs.h
+c++defs.h: $(top_srcdir)/import/extra/snippet/c++defs.h
 	$(AM_V_GEN)rm -f $@-t $@ && \
 	sed -n -e '/_GL_CXXDEFS/,$$p' \
-	  < $(top_srcdir)/gnulib/import/extra/snippet/c++defs.h \
+	  < $(top_srcdir)/import/extra/snippet/c++defs.h \
 	  > $@-t && \
 	mv $@-t $@
 # The warn-on-use.h that gets inserted into generated .h files is the same as
 # build-aux/snippet/warn-on-use.h, except that it has the copyright header cut
 # off.
-warn-on-use.h: $(top_srcdir)/gnulib/import/extra/snippet/warn-on-use.h
+warn-on-use.h: $(top_srcdir)/import/extra/snippet/warn-on-use.h
 	$(AM_V_GEN)rm -f $@-t $@ && \
 	sed -n -e '/^.ifndef/,$$p' \
-	  < $(top_srcdir)/gnulib/import/extra/snippet/warn-on-use.h \
+	  < $(top_srcdir)/import/extra/snippet/warn-on-use.h \
 	  > $@-t && \
 	mv $@-t $@
 
diff --git a/gdb/gnulib/import/m4/gnulib-cache.m4 b/gdb/gnulib/import/m4/gnulib-cache.m4
index 98151283362..ca089fa64ae 100644
--- a/gdb/gnulib/import/m4/gnulib-cache.m4
+++ b/gdb/gnulib/import/m4/gnulib-cache.m4
@@ -27,7 +27,7 @@
 
 
 # Specification in the form of a command-line invocation:
-#   gnulib-tool --import --dir=. --lib=libgnu --source-base=gnulib/import --m4-base=gnulib/import/m4 --doc-base=doc --tests-base=tests --aux-dir=gnulib/import/extra --no-conditional-dependencies --no-libtool --macro-prefix=gl --no-vc-files inttypes memmem update-copyright
+#   gnulib-tool --import --dir=. --lib=libgnu --source-base=import --m4-base=import/m4 --doc-base=doc --tests-base=tests --aux-dir=import/extra --no-conditional-dependencies --no-libtool --macro-prefix=gl --no-vc-files inttypes memmem update-copyright
 
 # Specification in the form of a few gnulib-tool.m4 macro invocations:
 gl_LOCAL_DIR([])
@@ -37,8 +37,8 @@ gl_MODULES([
   update-copyright
 ])
 gl_AVOID([])
-gl_SOURCE_BASE([gnulib/import])
-gl_M4_BASE([gnulib/import/m4])
+gl_SOURCE_BASE([import])
+gl_M4_BASE([import/m4])
 gl_PO_BASE([])
 gl_DOC_BASE([doc])
 gl_TESTS_BASE([tests])
diff --git a/gdb/gnulib/import/m4/gnulib-comp.m4 b/gdb/gnulib/import/m4/gnulib-comp.m4
index bde90d37242..59c3f1561c9 100644
--- a/gdb/gnulib/import/m4/gnulib-comp.m4
+++ b/gdb/gnulib/import/m4/gnulib-comp.m4
@@ -64,14 +64,14 @@ AC_DEFUN([gl_INIT],
   gl_cond_libtool=false
   gl_libdeps=
   gl_ltlibdeps=
-  gl_m4_base='gnulib/import/m4'
+  gl_m4_base='import/m4'
   m4_pushdef([AC_LIBOBJ], m4_defn([gl_LIBOBJ]))
   m4_pushdef([AC_REPLACE_FUNCS], m4_defn([gl_REPLACE_FUNCS]))
   m4_pushdef([AC_LIBSOURCES], m4_defn([gl_LIBSOURCES]))
   m4_pushdef([gl_LIBSOURCES_LIST], [])
   m4_pushdef([gl_LIBSOURCES_DIR], [])
   gl_COMMON
-  gl_source_base='gnulib/import'
+  gl_source_base='import'
 gl_INTTYPES_H
 gl_INTTYPES_INCOMPLETE
 gl_FUNC_MEMCHR
@@ -197,7 +197,7 @@ AC_DEFUN([gl_REPLACE_FUNCS], [
 AC_DEFUN([gl_LIBSOURCES], [
   m4_foreach([_gl_NAME], [$1], [
     m4_if(_gl_NAME, [alloca.c], [], [
-      m4_define([gl_LIBSOURCES_DIR], [gnulib/import])
+      m4_define([gl_LIBSOURCES_DIR], [import])
       m4_append([gl_LIBSOURCES_LIST], _gl_NAME, [ ])
     ])
   ])
@@ -257,7 +257,6 @@ AC_DEFUN([gl_FILE_LIST], [
   m4/memmem.m4
   m4/mmap-anon.m4
   m4/multiarch.m4
-  m4/onceonly.m4
   m4/stddef_h.m4
   m4/stdint.m4
   m4/string_h.m4