[Libguestfs] febootstrap git empty /lib dir

[Jim Meyering]

Richard W.M. Jones wrote:
> On Wed, Jun 16, 2010 at 03:38:22PM -0700, Dwayne Fontenot <dwayne.fontenot at att.net> wrote:
>> Is lib/ supposed to be empty in febootstrap git HEAD?
>
> Yes.  Run ./autogen.sh to populate it with gnulib stuff.
>
> Actually, this may not work too well unless you have gnulib checked
> out exactly in ../gnulib.  I need to ask Jim Meyering nicely if he'll
> make gnulib into a submodule of febootstrap.

Hi Rich,

Proposed patch below.
For the record, I did this:

  $ git submodule add git://git.sv.gnu.org/gnulib.git gnulib
  $ git add .gitmodules gnulib
  ...

and updated autogen.sh.


>From 2a31d54ee77832eaa2dfd9671a513347deeb295b Mon Sep 17 00:00:00 2001
From: Jim Meyering <meyering at redhat.com>
Date: Thu, 17 Jun 2010 12:37:10 +0200
Subject: [PATCH] maint: use a git submodule for gnulib

* .gitmodules: New file, to track gnulib.
* gnulib: New file, created by running this:
git submodule add git://git.sv.gnu.org/gnulib.git gnulib
* autogen.sh: Use the new, guaranteed-present gnulib directory.
---
 .gitmodules   |    3 +++
 autogen.sh    |    4 +---
 gnulib        |    1 +
 m4/.gitignore |    1 +
 4 files changed, 6 insertions(+), 3 deletions(-)
 create mode 100644 .gitmodules
 create mode 160000 gnulib

diff --git a/.gitmodules b/.gitmodules
new file mode 100644
index 0000000..acb2669
--- /dev/null
+++ b/.gitmodules
@@ -0,0 +1,3 @@
+[submodule "gnulib"]
+	path = gnulib
+	url = git://git.sv.gnu.org/gnulib.git
diff --git a/autogen.sh b/autogen.sh
index 0ab1868..449b908 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -1,8 +1,6 @@
 #!/bin/sh -

-if [ -d ../gnulib ]; then
-    ../gnulib/gnulib-tool --update
-fi
+gnulib/gnulib-tool --update

 export AUTOMAKE='automake --foreign --add-missing'
 autoreconf
diff --git a/gnulib b/gnulib
new file mode 160000
index 0000000..b3c3b08
--- /dev/null
+++ b/gnulib
@@ -0,0 +1 @@
+Subproject commit b3c3b08eab509ef08c9303b05375088575f8cc1b
diff --git a/m4/.gitignore b/m4/.gitignore
index 9601bdc..309120e 100644
--- a/m4/.gitignore
+++ b/m4/.gitignore
@@ -88,3 +88,4 @@
 /xgetcwd.m4
 /xsize.m4
 /xvasprintf.m4
+/asm-underscore.m4
--
1.7.1.556.ga4230