From c906f15d5ead18a5e848f11391e48f05b7868268 Mon Sep 17 00:00:00 2001
From: "Gary V. Vaughan" <gary@gnu.org>
Date: Sun, 22 Sep 2013 10:49:34 +0700
Subject: configury: move gnulib subproject to build-aux subdirectory.

* gnulib: Move from here...
* build-aux/gnulib: ...to here.
* bootstrap.conf (gnulib_path): Set appropriately.
* .gitignore: Adjust.

Signed-off-by: Gary V. Vaughan <gary@gnu.org>
---
 .gitignore       | 5 ++++-
 bootstrap.conf   | 3 +++
 build-aux/gnulib | 1 +
 gnulib           | 1 -
 4 files changed, 8 insertions(+), 2 deletions(-)
 create mode 160000 build-aux/gnulib
 delete mode 160000 gnulib

diff --git a/.gitignore b/.gitignore
index bd4195b5..658005a6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -26,7 +26,10 @@ ABOUT-NLS
 /aclocal.m4
 /aclocal.m4t
 autom4te.cache
-/build-aux
+build-aux/
+!build-aux/gl/
+!build-aux/gnulib/
+!build-aux/m4/
 /ChangeLog
 /config.cache
 /config.h
diff --git a/bootstrap.conf b/bootstrap.conf
index 4df5c7aa..41fe72be 100644
--- a/bootstrap.conf
+++ b/bootstrap.conf
@@ -39,6 +39,9 @@ buildreq_readme=HACKING
 # A file only visible in a vcs working directory.
 checkout_only_file=HACKING
 
+# Local gnulib submodule path.
+gnulib_path=build-aux/gnulib
+
 # Additional gnulib-tool options to use.
 gnulib_tool_options=$gnulib_tool_options'
 	--libtool
diff --git a/build-aux/gnulib b/build-aux/gnulib
new file mode 160000
index 00000000..a4482b66
--- /dev/null
+++ b/build-aux/gnulib
@@ -0,0 +1 @@
+Subproject commit a4482b667f8c6ba6e89eacb876fab7ff4775dab4
diff --git a/gnulib b/gnulib
deleted file mode 160000
index a4482b66..00000000
--- a/gnulib
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit a4482b667f8c6ba6e89eacb876fab7ff4775dab4
-- 
cgit v1.2.1