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

gdb/
	* gnulib/: Move whole directory ...
	* gnulib/import/: ... here, and re-rerun gnulib-tool to adjust.
	* Makefile.in (LIBGNU, INCGNU, GNULIB_H, CLEANDIRS)
	(REQUIRED_SUBDIRS, all-lib, gnulib/Makefile, ACLOCAL_AMFLAGS)
	(aclocal_m4_deps): Adjust.
	* aclocal.m4: Regenerate.
	* configure: Regenerate.
	* configure.ac: Adjust AC_OUTPUT output.

	gdbserver/
	* Makefile.in (LIBGNU, INCGNU): Adjust.
	(GNULIB_FLAGS_TO_PASS, GNULIB_H): Adjust.
	(all, install-only, uninstall, clean-info, all-lib, clean)
	(maintainer-clean, Makefile, gnulib/Makefile): Adjust.
	* configure.ac: Adjust AC_OUTPUT output.
	* aclocal.m4: Regenerate.
	* configure: Regenerate.

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 --m4-base=gnulib/m4 --doc-base=doc --tests-base=tests --aux-dir=gnulib/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=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
 
 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/extra/snippet/arg-nonnull.h
+arg-nonnull.h: $(top_srcdir)/gnulib/import/extra/snippet/arg-nonnull.h
 	$(AM_V_GEN)rm -f $@-t $@ && \
 	sed -n -e '/GL_ARG_NONNULL/,$$p' \
-	  < $(top_srcdir)/gnulib/extra/snippet/arg-nonnull.h \
+	  < $(top_srcdir)/gnulib/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/extra/snippet/arg-nonnull.h
+EXTRA_DIST += $(top_srcdir)/gnulib/import/extra/snippet/arg-nonnull.h
 
 ## end   gnulib module snippet/arg-nonnull
 
@@ -146,17 +146,17 @@ EXTRA_DIST += $(top_srcdir)/gnulib/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/extra/snippet/c++defs.h
+c++defs.h: $(top_srcdir)/gnulib/import/extra/snippet/c++defs.h
 	$(AM_V_GEN)rm -f $@-t $@ && \
 	sed -n -e '/_GL_CXXDEFS/,$$p' \
-	  < $(top_srcdir)/gnulib/extra/snippet/c++defs.h \
+	  < $(top_srcdir)/gnulib/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/extra/snippet/c++defs.h
+EXTRA_DIST += $(top_srcdir)/gnulib/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/extra/snippet/warn-on-use.h
+warn-on-use.h: $(top_srcdir)/gnulib/import/extra/snippet/warn-on-use.h
 	$(AM_V_GEN)rm -f $@-t $@ && \
 	sed -n -e '/^.ifndef/,$$p' \
-	  < $(top_srcdir)/gnulib/extra/snippet/warn-on-use.h \
+	  < $(top_srcdir)/gnulib/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/extra/snippet/warn-on-use.h
+EXTRA_DIST += $(top_srcdir)/gnulib/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/extra/update-copyright
+EXTRA_DIST += $(top_srcdir)/gnulib/import/extra/update-copyright
 
 ## end   gnulib module update-copyright
 

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 --m4-base=gnulib/m4 --doc-base=doc --tests-base=tests --aux-dir=gnulib/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=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
 
 
 
@@ -60,32 +60,32 @@ POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
 target_triplet = @target@
-subdir = gnulib
+subdir = gnulib/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/m4/00gnulib.m4 \
-	$(top_srcdir)/gnulib/m4/extensions.m4 \
-	$(top_srcdir)/gnulib/m4/gnulib-common.m4 \
-	$(top_srcdir)/gnulib/m4/gnulib-comp.m4 \
-	$(top_srcdir)/gnulib/m4/include_next.m4 \
-	$(top_srcdir)/gnulib/m4/inttypes-pri.m4 \
-	$(top_srcdir)/gnulib/m4/inttypes.m4 \
-	$(top_srcdir)/gnulib/m4/longlong.m4 \
-	$(top_srcdir)/gnulib/m4/memchr.m4 \
-	$(top_srcdir)/gnulib/m4/memmem.m4 \
-	$(top_srcdir)/gnulib/m4/mmap-anon.m4 \
-	$(top_srcdir)/gnulib/m4/multiarch.m4 \
-	$(top_srcdir)/gnulib/m4/onceonly.m4 \
-	$(top_srcdir)/gnulib/m4/stddef_h.m4 \
-	$(top_srcdir)/gnulib/m4/stdint.m4 \
-	$(top_srcdir)/gnulib/m4/string_h.m4 \
-	$(top_srcdir)/gnulib/m4/warn-on-use.m4 \
-	$(top_srcdir)/gnulib/m4/wchar_t.m4 $(top_srcdir)/acinclude.m4 \
-	$(top_srcdir)/../bfd/bfd.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 \
@@ -504,11 +504,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/extra/snippet/arg-nonnull.h \
-	$(top_srcdir)/gnulib/extra/snippet/c++defs.h \
-	$(top_srcdir)/gnulib/extra/snippet/warn-on-use.h stddef.in.h \
-	stdint.in.h string.in.h \
-	$(top_srcdir)/gnulib/extra/update-copyright
+	$(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
 
 # 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 +553,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__confi
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnits gnulib/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnits gnulib/import/Makefile'; \
 	$(am__cd) $(top_srcdir) && \
-	  $(AUTOMAKE) --gnits gnulib/Makefile
+	  $(AUTOMAKE) --gnits gnulib/import/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
@@ -973,27 +973,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/extra/snippet/arg-nonnull.h
+arg-nonnull.h: $(top_srcdir)/gnulib/import/extra/snippet/arg-nonnull.h
 	$(AM_V_GEN)rm -f $@-t $@ && \
 	sed -n -e '/GL_ARG_NONNULL/,$$p' \
-	  < $(top_srcdir)/gnulib/extra/snippet/arg-nonnull.h \
+	  < $(top_srcdir)/gnulib/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/extra/snippet/c++defs.h
+c++defs.h: $(top_srcdir)/gnulib/import/extra/snippet/c++defs.h
 	$(AM_V_GEN)rm -f $@-t $@ && \
 	sed -n -e '/_GL_CXXDEFS/,$$p' \
-	  < $(top_srcdir)/gnulib/extra/snippet/c++defs.h \
+	  < $(top_srcdir)/gnulib/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/extra/snippet/warn-on-use.h
+warn-on-use.h: $(top_srcdir)/gnulib/import/extra/snippet/warn-on-use.h
 	$(AM_V_GEN)rm -f $@-t $@ && \
 	sed -n -e '/^.ifndef/,$$p' \
-	  < $(top_srcdir)/gnulib/extra/snippet/warn-on-use.h \
+	  < $(top_srcdir)/gnulib/import/extra/snippet/warn-on-use.h \
 	  > $@-t && \
 	mv $@-t $@
 

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 --m4-base=gnulib/m4 --doc-base=doc --tests-base=tests --aux-dir=gnulib/extra --no-conditional-dependencies --no-libtool --macro-prefix=gl --no-vc-files inttypes memmem update-copyright
+#   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
 
 # 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])
-gl_M4_BASE([gnulib/m4])
+gl_SOURCE_BASE([gnulib/import])
+gl_M4_BASE([gnulib/import/m4])
 gl_PO_BASE([])
 gl_DOC_BASE([doc])
 gl_TESTS_BASE([tests])

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/m4'
+  gl_m4_base='gnulib/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'
+  gl_source_base='gnulib/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])
+      m4_define([gl_LIBSOURCES_DIR], [gnulib/import])
       m4_append([gl_LIBSOURCES_LIST], _gl_NAME, [ ])
     ])
   ])