From: Gary V. Vaughan <gary@gnu.org>
Date: Thu, 9 Sep 2010 18:14:41 +0000 (+0700)
Subject: maint: add gnulib submodule.
X-Git-Tag: v2.4.2.418~320
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b868b7c48743870d2caea1a60077a066752bf0e1;p=thirdparty%2Flibtool.git

maint: add gnulib submodule.

* configure.ac (GL_INIT, GL_EARLY): Initialise gnulib, and expand
its configure time checks.
* .gitmodules (gnulib): New file with configuration for our
gnulib git submodule.

Signed-off-by: Gary V. Vaughan <gary@gnu.org>
---

diff --git a/.gitmodules b/.gitmodules
new file mode 100644
index 000000000..bb9e1baf5
--- /dev/null
+++ b/.gitmodules
@@ -0,0 +1,3 @@
+[submodule "gnulib"]
+        path = gnulib
+        url = git://git.sv.gnu.org/gnulib.git
diff --git a/ChangeLog b/ChangeLog
index 839614c7e..d78615c47 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2010-08-27  Gary V. Vaughan  <gary@gnu.org>
+
+	maint: add gnulib submodule.
+	* configure.ac (GL_INIT, GL_EARLY): Initialise gnulib, and expand
+	its configure time checks.
+	* .gitmodules (gnulib): New file with configuration for our
+	gnulib git submodule.
+
 2010-09-01  Gary V. Vaughan  <gary@gnu.org>
 
 	maint: don't run help2man on programs not-yet-built.
diff --git a/Makefile.am b/Makefile.am
index 2f7ac2da2..694a4d949 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -28,7 +28,8 @@ ACLOCAL_AMFLAGS  	= -I libltdl/m4
 AM_CPPFLAGS		=
 AM_LDFLAGS		=
 
-DIST_SUBDIRS		= .
+SUBDIRS			= .
+DIST_SUBDIRS		= $(SUBDIRS)
 EXTRA_DIST		=
 
 BUILT_SOURCES		= libtool libtoolize
diff --git a/configure.ac b/configure.ac
index ede0fc01e..5f052b0e5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -194,6 +194,7 @@ AC_SUBST([DIST_MAKEFILE_LIST])
 # a good C compiler: if the following C++ tests fail, the whole libtool
 # build fails!
 AC_PROG_CC
+GL_EARLY
 AM_PROG_CC_C_O
 AC_PROG_CPP
 
@@ -254,6 +255,11 @@ else
 fi
 AC_SUBST([ORDER])
 
+## ---------------------- ##
+## Gnulib initialisation. ##
+## ---------------------- ##
+GL_INIT
+
 ## ------------- ##
 ## Documentation ##
 ## ------------- ##
diff --git a/gnulib b/gnulib
new file mode 160000
index 000000000..356e3744f
--- /dev/null
+++ b/gnulib
@@ -0,0 +1 @@
+Subproject commit 356e3744fbe79b23e608b8f4ec1b8204986b8f8e
diff --git a/libltdl/.gitignore b/libltdl/.gitignore
index 8ab5b80c2..6ca830cfc 100644
--- a/libltdl/.gitignore
+++ b/libltdl/.gitignore
@@ -1,2 +1,5 @@
 /Makefile.am
 /argz.h
+/libgnu
+/dummy.c
+/gnulib.mk
diff --git a/libltdl/libgnu/.gitignore b/libltdl/libgnu/.gitignore
new file mode 100644
index 000000000..d9f539420
--- /dev/null
+++ b/libltdl/libgnu/.gitignore
@@ -0,0 +1,2 @@
+/Makefile.am
+/dummy.c
diff --git a/libltdl/m4/.gitignore b/libltdl/m4/.gitignore
index e587180a0..1facea7d5 100644
--- a/libltdl/m4/.gitignore
+++ b/libltdl/m4/.gitignore
@@ -1 +1,6 @@
+/00gnulib.m4
+/gnulib-cache.m4
+/gnulib-common.m4
+/gnulib-comp.m4
+/gnulib-tool.m4
 /ltversion.m4