summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.gitmodules3
-rw-r--r--ChangeLog8
-rw-r--r--Makefile.am3
-rw-r--r--configure.ac6
m---------gnulib0
-rw-r--r--libltdl/.gitignore3
-rw-r--r--libltdl/libgnu/.gitignore2
-rw-r--r--libltdl/m4/.gitignore5
8 files changed, 29 insertions, 1 deletions
diff --git a/.gitmodules b/.gitmodules
new file mode 100644
index 00000000..bb9e1baf
--- /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 839614c7..d78615c4 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 2f7ac2da..694a4d94 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 ede0fc01..5f052b0e 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
+Subproject 356e3744fbe79b23e608b8f4ec1b8204986b8f8
diff --git a/libltdl/.gitignore b/libltdl/.gitignore
index 8ab5b80c..6ca830cf 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 00000000..d9f53942
--- /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 e587180a..1facea7d 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