[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]

[Libguestfs] [PATCH] build: Update gnulib submodule to latest.



Just for discussion.  With this very large patch I am able
to get through a build on my local machine at least.

Rich.

-- 
Richard Jones, Virtualization Group, Red Hat http://people.redhat.com/~rjones
virt-top is 'top' for virtual machines.  Tiny program with many
powerful monitoring features, net stats, disk stats, logging, etc.
http://et.redhat.com/~rjones/virt-top
>From 32169ec1c4f7f9240476a669b616d5ac784913c2 Mon Sep 17 00:00:00 2001
From: Richard W.M. Jones <rjones redhat com>
Date: Thu, 3 Mar 2011 10:50:38 +0000
Subject: [PATCH] build: Update gnulib submodule to latest.

---
 .gitignore                |    9 +-
 .gnulib                   |    2 +-
 INSTALL                   |    1 +
 bootstrap                 |  978 ++++++++++++++++++++++++++++++++++++++++++---
 bootstrap.conf            |  109 +++++
 capitests/Makefile.am     |    2 +-
 cat/Makefile.am           |    6 +-
 daemon/.gitignore         |   41 ++-
 daemon/m4/gnulib-cache.m4 |    6 +-
 df/Makefile.am            |    2 +-
 fish/Makefile.am          |    2 +-
 fuse/Makefile.am          |    2 +-
 gnulib/lib/Makefile.am    |    1 +
 gnulib/tests/Makefile.am  |    1 +
 inspector/Makefile.am     |    2 +-
 m4/.gitignore             |  252 +++++++------
 rescue/Makefile.am        |    2 +-
 src/Makefile.am           |    2 +-
 18 files changed, 1222 insertions(+), 198 deletions(-)

diff --git a/.gitignore b/.gitignore
index 1511c4a..19096fe 100644
--- a/.gitignore
+++ b/.gitignore
@@ -98,6 +98,14 @@ generator/.pod2text.data*
 generator/files-generated.txt
 generator/generator
 generator/stamp-generator
+gnulib/lib/.gitignore
+gnulib/lib/*.alias
+gnulib/lib/*.h
+gnulib/lib/arpa/
+gnulib/lib/glthread/
+gnulib/tests/.gitignore
+gnulib/tests/*.h
+gnulib/tests/glthread/
 guestfsd-in-wine.log
 haskell/Bindtests
 haskell/Bindtests.hs
@@ -315,5 +323,4 @@ tools/virt-*.pl
 /GNUmakefile
 /maint.mk
 /build-aux
-/gnulib
 .git-module-status
diff --git a/.gnulib b/.gnulib
index 74d5093..c2090a8 160000
--- a/.gnulib
+++ b/.gnulib
@@ -1 +1 @@
-Subproject commit 74d509383fe30bb5511a978b52e4f8ecae37826b
+Subproject commit c2090a84dc3997acada3166772afac94f2d3a25c
diff --git a/INSTALL b/INSTALL
new file mode 120000
index 0000000..8ae989b
--- /dev/null
+++ b/INSTALL
@@ -0,0 +1 @@
+.gnulib/doc/INSTALL
\ No newline at end of file
diff --git a/bootstrap b/bootstrap
index c1712ae..e9ec11e 100755
--- a/bootstrap
+++ b/bootstrap
@@ -1,90 +1,946 @@
-#!/bin/sh
+#! /bin/sh
+# Print a version string.
+scriptversion=2011-01-21.16; # UTC
+
+# Bootstrap this package from checked-out sources.
+
+# Copyright (C) 2003-2011 Free Software Foundation, Inc.
+
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Originally written by Paul Eggert.  The canonical version of this
+# script is maintained as build-aux/bootstrap in gnulib, however, to
+# be useful to your project, you should place a copy of it under
+# version control in the top-level directory of your project.  The
+# intent is that all customization can be done with a bootstrap.conf
+# file also maintained in your version control; gnulib comes with a
+# template build-aux/bootstrap.conf to get you started.
+
+# Please report bugs or propose patches to bug-gnulib gnu org 
+
+nl='
+'
+
+# Ensure file names are sorted consistently across platforms.
+LC_ALL=C
+export LC_ALL
+
+local_gl_dir=gl
+
+# Temporary directory names.
+bt='._bootmp'
+bt_regex=`echo "$bt"| sed 's/\./[.]/g'`
+bt2=${bt}2
+me=$0
 
 usage() {
-  echo >&2 "\
-Usage: $0 [OPTION]...
+  cat <<EOF
+Usage: $me [OPTION]...
 Bootstrap this package from the checked-out sources.
+
+Options:
+ --gnulib-srcdir=DIRNAME  specify the local directory where gnulib
+                          sources reside.  Use this if you already
+                          have gnulib sources on your machine, and
+                          do not want to waste your bandwidth downloading
+                          them again.  Defaults to \$GNULIB_SRCDIR
+ --bootstrap-sync         if this bootstrap script is not identical to
+                          the version in the local gnulib sources,
+                          update this script, and then restart it with
+                          /bin/sh or the shell \$CONFIG_SHELL
+ --no-bootstrap-sync      do not check whether bootstrap is out of sync
+ --copy                   copy files instead of creating symbolic links
+ --force                  attempt to bootstrap even if the sources seem
+                          not to have been checked out
+ --no-git                 do not use git to update gnulib.  Requires that
+                          --gnulib-srcdir point to a correct gnulib snapshot
+ --skip-po                do not download po files
+
+If the file $me.conf exists in the same directory as this script, its
+contents are read as shell variables to configure the bootstrap.
+
+For build prerequisites, environment variables like \$AUTOCONF and \$AMTAR
+are honored.
+
+Running without arguments will suffice in most cases.
+EOF
+}
+
+# Configuration.
+
+# Name of the Makefile.am
+gnulib_mk=gnulib.mk
+
+# List of gnulib modules needed.
+gnulib_modules=
+
+# Any gnulib files needed that are not in modules.
+gnulib_files=
+
+# A function to be called to edit gnulib.mk right after it's created.
+# Override it via your own definition in bootstrap.conf.
+gnulib_mk_hook() { :; }
+
+# A function to be called after everything else in this script.
+# Override it via your own definition in bootstrap.conf.
+bootstrap_epilogue() { :; }
+
+# The command to download all .po files for a specified domain into
+# a specified directory.  Fill in the first %s is the domain name, and
+# the second with the destination directory.  Use rsync's -L and -r
+# options because the latest/%s directory and the .po files within are
+# all symlinks.
+po_download_command_format=\
+"rsync --delete --exclude '*.s1' -Lrtvz \
+ 'translationproject.org::tp/latest/%s/' '%s'"
+
+extract_package_name='
+  /^AC_INIT(/{
+     /.*,.*,.*, */{
+       s///
+       s/[][]//g
+       s/)$//
+       p
+       q
+     }
+     s/AC_INIT(\[*//
+     s/]*,.*//
+     s/^GNU //
+     y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/
+     s/[^A-Za-z0-9_]/-/g
+     p
+  }
+'
+package=`sed -n "$extract_package_name" configure.ac` || exit
+gnulib_name=lib$package
+
+build_aux=build-aux
+source_base=lib
+m4_base=m4
+doc_base=doc
+tests_base=tests
+
+# Extra files from gnulib, which override files from other sources.
+gnulib_extra_files="
+        $build_aux/install-sh
+        $build_aux/missing
+        $build_aux/mdate-sh
+        $build_aux/texinfo.tex
+        $build_aux/depcomp
+        $build_aux/config.guess
+        $build_aux/config.sub
+        doc/INSTALL
 "
+
+# Additional gnulib-tool options to use.  Use "\newline" to break lines.
+gnulib_tool_option_extras=
+
+# Other locale categories that need message catalogs.
+EXTRA_LOCALE_CATEGORIES=
+
+# Additional xgettext options to use.  Use "\\\newline" to break lines.
+XGETTEXT_OPTIONS='\\\
+ --flag=_:1:pass-c-format\\\
+ --flag=N_:1:pass-c-format\\\
+ --flag=error:3:c-format --flag=error_at_line:5:c-format\\\
+'
+
+# Package bug report address and copyright holder for gettext files
+COPYRIGHT_HOLDER='Free Software Foundation, Inc.'
+MSGID_BUGS_ADDRESS=bug-$package gnu org
+
+# Files we don't want to import.
+excluded_files=
+
+# File that should exist in the top directory of a checked out hierarchy,
+# but not in a distribution tarball.
+checkout_only_file=README-hacking
+
+# Whether to use copies instead of symlinks.
+copy=false
+
+# Set this to '.cvsignore .gitignore' in bootstrap.conf if you want
+# those files to be generated in directories like lib/, m4/, and po/.
+# Or set it to 'auto' to make this script select which to use based
+# on which version control system (if any) is used in the source directory.
+vc_ignore=auto
+
+# Set this to true in bootstrap.conf to enable --bootstrap-sync by
+# default.
+bootstrap_sync=false
+
+# Use git to update gnulib sources
+use_git=true
+
+# find_tool ENVVAR NAMES...
+# -------------------------
+# Search for a required program.  Use the value of ENVVAR, if set,
+# otherwise find the first of the NAMES that can be run (i.e.,
+# supports --version).  If found, set ENVVAR to the program name,
+# die otherwise.
+find_tool ()
+{
+  find_tool_envvar=$1
+  shift
+  find_tool_names=$@
+  eval "find_tool_res=\$$find_tool_envvar"
+  if test x"$find_tool_res" = x; then
+    for i
+    do
+      if ($i --version </dev/null) >/dev/null 2>&1; then
+       find_tool_res=$i
+       break
+      fi
+    done
+  else
+    find_tool_error_prefix="\$$find_tool_envvar: "
+  fi
+  if test x"$find_tool_res" = x; then
+    echo >&2 "$me: one of these is required: $find_tool_names"
+    exit 1
+  fi
+  ($find_tool_res --version </dev/null) >/dev/null 2>&1 || {
+    echo >&2 "$me: ${find_tool_error_prefix}cannot run $find_tool_res --version"
+    exit 1
+  }
+  eval "$find_tool_envvar=\$find_tool_res"
+  eval "export $find_tool_envvar"
 }
 
+# Find sha1sum, named gsha1sum on MacPorts, and shasum on MacOS 10.6.
+find_tool SHA1SUM sha1sum gsha1sum shasum
+
+# Override the default configuration, if necessary.
+# Make sure that bootstrap.conf is sourced from the current directory
+# if we were invoked as "sh bootstrap".
+case "$0" in
+  */*) test -r "$0.conf" && . "$0.conf" ;;
+  *) test -r "$0.conf" && . ./"$0.conf" ;;
+esac
+
+
+if test "$vc_ignore" = auto; then
+  vc_ignore=
+  test -d .git && vc_ignore=.gitignore
+  test -d CVS && vc_ignore="$vc_ignore .cvsignore"
+fi
+
+# Translate configuration into internal form.
+
+# Parse options.
+
 for option
 do
   case $option in
   --help)
     usage
     exit;;
+  --gnulib-srcdir=*)
+    GNULIB_SRCDIR=`expr "X$option" : 'X--gnulib-srcdir=\(.*\)'`;;
+  --skip-po)
+    SKIP_PO=t;;
+  --force)
+    checkout_only_file=;;
+  --copy)
+    copy=true;;
+  --bootstrap-sync)
+    bootstrap_sync=true;;
+  --no-bootstrap-sync)
+    bootstrap_sync=false;;
+  --no-git)
+    use_git=false;;
   *)
     echo >&2 "$0: $option: unknown option"
     exit 1;;
   esac
 done
 
+if $use_git || test -d "$GNULIB_SRCDIR"; then
+  :
+else
+  echo "$0: Error: --no-git requires --gnulib-srcdir" >&2
+  exit 1
+fi
+
+if test -n "$checkout_only_file" && test ! -r "$checkout_only_file"; then
+  echo "$0: Bootstrapping from a non-checked-out distribution is risky." >&2
+  exit 1
+fi
+
+# If $STR is not already on a line by itself in $FILE, insert it,
+# sorting the new contents of the file and replacing $FILE with the result.
+insert_sorted_if_absent() {
+  file=$1
+  str=$2
+  test -f $file || touch $file
+  echo "$str" | sort -u - $file | cmp - $file > /dev/null \
+    || echo "$str" | sort -u - $file -o $file \
+    || exit 1
+}
+
+# Adjust $PATTERN for $VC_IGNORE_FILE and insert it with
+# insert_sorted_if_absent.
+insert_vc_ignore() {
+  vc_ignore_file="$1"
+  pattern="$2"
+  case $vc_ignore_file in
+  *.gitignore)
+    # A .gitignore entry that does not start with `/' applies
+    # recursively to subdirectories, so prepend `/' to every
+    # .gitignore entry.
+    pattern=`echo "$pattern" | sed s,^,/,`;;
+  esac
+  insert_sorted_if_absent "$vc_ignore_file" "$pattern"
+}
+
+# Die if there is no AC_CONFIG_AUX_DIR($build_aux) line in configure.ac.
+found_aux_dir=no
+grep '^[	 ]*AC_CONFIG_AUX_DIR(\['"$build_aux"'\])' configure.ac \
+    >/dev/null && found_aux_dir=yes
+grep '^[	 ]*AC_CONFIG_AUX_DIR('"$build_aux"')' configure.ac \
+    >/dev/null && found_aux_dir=yes
+if test $found_aux_dir = no; then
+  echo "$0: expected line not found in configure.ac. Add the following:" >&2
+  echo "  AC_CONFIG_AUX_DIR([$build_aux])" >&2
+  exit 1
+fi
+
+# If $build_aux doesn't exist, create it now, otherwise some bits
+# below will malfunction.  If creating it, also mark it as ignored.
+if test ! -d $build_aux; then
+  mkdir $build_aux
+  for dot_ig in x $vc_ignore; do
+    test $dot_ig = x && continue
+    insert_vc_ignore $dot_ig $build_aux
+  done
+fi
+
+# Note this deviates from the version comparison in automake
+# in that it treats 1.5 < 1.5.0, and treats 1.4.4a < 1.4-p3a
+# but this should suffice as we won't be specifying old
+# version formats or redundant trailing .0 in bootstrap.conf.
+# If we did want full compatibility then we should probably
+# use m4_version_compare from autoconf.
+sort_ver() { # sort -V is not generally available
+  ver1="$1"
+  ver2="$2"
+
+  # split on '.' and compare each component
+  i=1
+  while : ; do
+    p1=$(echo "$ver1" | cut -d. -f$i)
+    p2=$(echo "$ver2" | cut -d. -f$i)
+    if [ ! "$p1" ]; then
+      echo "$1 $2"
+      break
+    elif [ ! "$p2" ]; then
+      echo "$2 $1"
+      break
+    elif [ ! "$p1" = "$p2" ]; then
+      if [ "$p1" -gt "$p2" ] 2>/dev/null; then # numeric comparison
+        echo "$2 $1"
+      elif [ "$p2" -gt "$p1" ] 2>/dev/null; then # numeric comparison
+        echo "$1 $2"
+      else # numeric, then lexicographic comparison
+        lp=$(printf "$p1\n$p2\n" | LANG=C sort -n | tail -n1)
+        if [ "$lp" = "$p2" ]; then
+          echo "$1 $2"
+        else
+          echo "$2 $1"
+        fi
+      fi
+      break
+    fi
+    i=$(($i+1))
+  done
+}
+
+get_version() {
+  app=$1
+
+  $app --version >/dev/null 2>&1 || return 1
+
+  $app --version 2>&1 |
+  sed -n '# Move version to start of line.
+          s/.*[v ]\([0-9]\)/\1/
+
+          # Skip lines that do not start with version.
+          /^[0-9]/!d
+
+          # Remove characters after the version.
+          s/[^.a-z0-9-].*//
+
+          # The first component must be digits only.
+          s/^\([0-9]*\)[a-z-].*/\1/
+
+          #the following essentially does s/5.005/5.5/
+          s/\.0*\([1-9]\)/.\1/g
+          p
+          q'
+}
+
+check_versions() {
+  ret=0
+
+  while read app req_ver; do
+    # We only need libtoolize from the libtool package.
+    if test "$app" = libtool; then
+      app=libtoolize
+    fi
+    # Exempt git if --no-git is in effect.
+    if test "$app" = git; then
+      $use_git || continue
+    fi
+    # Honor $APP variables ($TAR, $AUTOCONF, etc.)
+    appvar=`echo $app | tr '[a-z]-' '[A-Z]_'`
+    test "$appvar" = TAR && appvar=AMTAR
+    eval "app=\${$appvar-$app}"
+    inst_ver=$(get_version $app)
+    if [ ! "$inst_ver" ]; then
+      echo "$me: Error: '$app' not found" >&2
+      ret=1
+    elif [ ! "$req_ver" = "-" ]; then
+      latest_ver=$(sort_ver $req_ver $inst_ver | cut -d' ' -f2)
+      if [ ! "$latest_ver" = "$inst_ver" ]; then
+        echo "$me: Error: '$app' version == $inst_ver is too old" >&2
+        echo "       '$app' version >= $req_ver is required" >&2
+        ret=1
+      fi
+    fi
+  done
+
+  return $ret
+}
+
+print_versions() {
+  echo "Program    Min_version"
+  echo "----------------------"
+  printf %s "$buildreq"
+  echo "----------------------"
+  # can't depend on column -t
+}
+
+use_libtool=0
+# We'd like to use grep -E, to see if any of LT_INIT,
+# AC_PROG_LIBTOOL, AM_PROG_LIBTOOL is used in configure.ac,
+# but that's not portable enough (e.g., for Solaris).
+grep '^[	 ]*A[CM]_PROG_LIBTOOL' configure.ac >/dev/null \
+  && use_libtool=1
+grep '^[	 ]*LT_INIT' configure.ac >/dev/null \
+  && use_libtool=1
+if test $use_libtool = 1; then
+  find_tool LIBTOOLIZE glibtoolize libtoolize
+fi
+
+if ! printf "$buildreq" | check_versions; then
+  echo >&2
+  if test -f README-prereq; then
+    echo "$0: See README-prereq for how to get the prerequisite programs" >&2
+  else
+    echo "$0: Please install the prerequisite programs" >&2
+  fi
+  exit 1
+fi
+
+echo "$0: Bootstrapping from checked-out $package sources..."
+
+# See if we can use gnulib's git-merge-changelog merge driver.
+if test -d .git && (git --version) >/dev/null 2>/dev/null ; then
+  if git config merge.merge-changelog.driver >/dev/null ; then
+    :
+  elif (git-merge-changelog --version) >/dev/null 2>/dev/null ; then
+    echo "$0: initializing git-merge-changelog driver"
+    git config merge.merge-changelog.name 'GNU-style ChangeLog merge driver'
+    git config merge.merge-changelog.driver 'git-merge-changelog %O %A %B'
+  else
+    echo "$0: consider installing git-merge-changelog from gnulib"
+  fi
+fi
+
+
+cleanup_gnulib() {
+  status=$?
+  rm -fr "$gnulib_path"
+  exit $status
+}
+
+git_modules_config () {
+  test -f .gitmodules && git config --file .gitmodules "$@"
+}
+
+gnulib_path=`git_modules_config submodule.gnulib.path`
+test -z "$gnulib_path" && gnulib_path=gnulib
+
 # Get gnulib files.
 
-echo "$0: getting gnulib files..."
-git submodule init || exit $?
-git submodule update || exit $?
-GNULIB_SRCDIR=.gnulib
+case ${GNULIB_SRCDIR--} in
+-)
+  if git_modules_config submodule.gnulib.url >/dev/null; then
+    echo "$0: getting gnulib files..."
+    git submodule init || exit $?
+    git submodule update || exit $?
 
-ls po/*.po 2>/dev/null | sed 's|.*/||; s|\.po$||' > po/LINGUAS
+  elif [ ! -d "$gnulib_path" ]; then
+    echo "$0: getting gnulib files..."
 
-# Run autopoint, to get po/Makevars.template:
-# Also, released autopoint has the tendency to install macros that have
-# been obsoleted in current gnulib, so run this before gnulib-tool.
-autopoint --force
+    trap cleanup_gnulib 1 2 13 15
 
-# Autoreconf runs aclocal before libtoolize, which causes spurious
-# warnings if the initial aclocal is confused by the libtoolized
-# (or worse out-of-date) macro directory.
-libtoolize --copy --install
+    shallow=
+    git clone -h 2>&1 | grep -- --depth > /dev/null && shallow='--depth 2'
+    git clone $shallow git://git.sv.gnu.org/gnulib "$gnulib_path" ||
+      cleanup_gnulib
+
+    trap - 1 2 13 15
+  fi
+  GNULIB_SRCDIR=$gnulib_path
+  ;;
+*)
+  # Use GNULIB_SRCDIR as a reference.
+  if test -d "$GNULIB_SRCDIR"/.git && \
+        git_modules_config submodule.gnulib.url >/dev/null; then
+    echo "$0: getting gnulib files..."
+    if git submodule -h|grep -- --reference > /dev/null; then
+      # Prefer the one-liner available in git 1.6.4 or newer.
+      git submodule update --init --reference "$GNULIB_SRCDIR" \
+        "$gnulib_path" || exit $?
+    else
+      # This fallback allows at least git 1.5.5.
+      if test -f "$gnulib_path"/gnulib-tool; then
+        # Since file already exists, assume submodule init already complete.
+        git submodule update || exit $?
+      else
+        # Older git can't clone into an empty directory.
+        rmdir "$gnulib_path" 2>/dev/null
+        git clone --reference "$GNULIB_SRCDIR" \
+          "$(git_modules_config submodule.gnulib.url)" "$gnulib_path" \
+          && git submodule init && git submodule update \
+          || exit $?
+      fi
+    fi
+    GNULIB_SRCDIR=$gnulib_path
+  fi
+  ;;
+esac
+
+if $bootstrap_sync; then
+  cmp -s "$0" "$GNULIB_SRCDIR/build-aux/bootstrap" || {
+    echo "$0: updating bootstrap and restarting..."
+    exec sh -c \
+      'cp "$1" "$2" && shift && exec "${CONFIG_SHELL-/bin/sh}" "$@"' \
+      -- "$GNULIB_SRCDIR/build-aux/bootstrap" \
+      "$0" "$@" --no-bootstrap-sync
+  }
+fi
 
 gnulib_tool=$GNULIB_SRCDIR/gnulib-tool
 <$gnulib_tool || exit
 
-(cd daemon && mkdir -p tests lib && ../$gnulib_tool --update)
-
-modules='
-arpa_inet
-c-ctype
-closeout
-error
-filevercmp
-fts
-full-read
-full-write
-gitlog-to-changelog
-gnu-make
-gnumakefile
-hash
-hash-pjw
-human
-ignore-value
-lock
-maintainer-makefile
-manywarnings
-netinet_in
-progname
-setenv
-strchrnul
-strerror
-strndup
-vasprintf
-vc-list-files
-warnings
-xalloc
-xalloc-die
-xstrtol
-xstrtoll
-xvasprintf
-'
+# Get translations.
+
+download_po_files() {
+  subdir=$1
+  domain=$2
+  echo "$me: getting translations into $subdir for $domain..."
+  cmd=`printf "$po_download_command_format" "$domain" "$subdir"`
+  eval "$cmd"
+}
+
+# Mirror .po files to $po_dir/.reference and copy only the new
+# or modified ones into $po_dir.  Also update $po_dir/LINGUAS.
+# Note po files that exist locally only are left in $po_dir but will
+# not be included in LINGUAS and hence will not be distributed.
+update_po_files() {
+  # Directory containing primary .po files.
+  # Overwrite them only when we're sure a .po file is new.
+  po_dir=$1
+  domain=$2
+
+  # Mirror *.po files into this dir.
+  # Usually contains *.s1 checksum files.
+  ref_po_dir="$po_dir/.reference"
+
+  test -d $ref_po_dir || mkdir $ref_po_dir || return
+  download_po_files $ref_po_dir $domain \
+    && ls "$ref_po_dir"/*.po 2>/dev/null |
+      sed 's|.*/||; s|\.po$||' > "$po_dir/LINGUAS" || return
+
+  langs=`cd $ref_po_dir && echo *.po|sed 's/\.po//g'`
+  test "$langs" = '*' && langs=x
+  for po in $langs; do
+    case $po in x) continue;; esac
+    new_po="$ref_po_dir/$po.po"
+    cksum_file="$ref_po_dir/$po.s1"
+    if ! test -f "$cksum_file" ||
+        ! test -f "$po_dir/$po.po" ||
+        ! $SHA1SUM -c --status "$cksum_file" \
+            < "$new_po" > /dev/null; then
+      echo "$me: updated $po_dir/$po.po..."
+      cp "$new_po" "$po_dir/$po.po" \
+          && $SHA1SUM < "$new_po" > "$cksum_file"
+    fi
+  done
+}
+
+case $SKIP_PO in
+'')
+  if test -d po; then
+    update_po_files po $package || exit
+  fi
+
+  if test -d runtime-po; then
+    update_po_files runtime-po $package-runtime || exit
+  fi;;
+esac
+
+symlink_to_dir()
+{
+  src=$1/$2
+  dst=${3-$2}
+
+  test -f "$src" && {
+
+    # If the destination directory doesn't exist, create it.
+    # This is required at least for "lib/uniwidth/cjk.h".
+    dst_dir=`dirname "$dst"`
+    if ! test -d "$dst_dir"; then
+      mkdir -p "$dst_dir"
+
+      # If we've just created a directory like lib/uniwidth,
+      # tell version control system(s) it's ignorable.
+      # FIXME: for now, this does only one level
+      parent=`dirname "$dst_dir"`
+      for dot_ig in x $vc_ignore; do
+        test $dot_ig = x && continue
+        ig=$parent/$dot_ig
+        insert_vc_ignore $ig `echo "$dst_dir"|sed 's,.*/,,'`
+      done
+    fi
+
+    if $copy; then
+      {
+        test ! -h "$dst" || {
+          echo "$me: rm -f $dst" &&
+          rm -f "$dst"
+        }
+      } &&
+      test -f "$dst" &&
+      cmp -s "$src" "$dst" || {
+        echo "$me: cp -fp $src $dst" &&
+        cp -fp "$src" "$dst"
+      }
+    else
+      test -h "$dst" &&
+      src_ls=`ls -diL "$src" 2>/dev/null` && set $src_ls && src_i=$1 &&
+      dst_ls=`ls -diL "$dst" 2>/dev/null` && set $dst_ls && dst_i=$1 &&
+      test "$src_i" = "$dst_i" || {
+        dot_dots=
+        case $src in
+        /*) ;;
+        *)
+          case /$dst/ in
+          *//* | */../* | */./* | /*/*/*/*/*/)
+             echo >&2 "$me: invalid symlink calculation: $src -> $dst"
+             exit 1;;
+          /*/*/*/*/)	dot_dots=../../../;;
+          /*/*/*/)	dot_dots=../../;;
+          /*/*/)	dot_dots=../;;
+          esac;;
+        esac
+
+        echo "$me: ln -fs $dot_dots$src $dst" &&
+        ln -fs "$dot_dots$src" "$dst"
+      }
+    fi
+  }
+}
+
+cp_mark_as_generated()
+{
+  cp_src=$1
+  cp_dst=$2
+
+  if cmp -s "$cp_src" "$GNULIB_SRCDIR/$cp_dst"; then
+    symlink_to_dir "$GNULIB_SRCDIR" "$cp_dst"
+  elif cmp -s "$cp_src" "$local_gl_dir/$cp_dst"; then
+    symlink_to_dir $local_gl_dir "$cp_dst"
+  else
+    case $cp_dst in
+      *.[ch])             c1='/* '; c2=' */';;
+      *.texi)             c1='@c '; c2=     ;;
+      *.m4|*/Make*|Make*) c1='# ' ; c2=     ;;
+      *)                  c1=     ; c2=     ;;
+    esac
+
+    # If the destination directory doesn't exist, create it.
+    # This is required at least for "lib/uniwidth/cjk.h".
+    dst_dir=`dirname "$cp_dst"`
+    test -d "$dst_dir" || mkdir -p "$dst_dir"
+
+    if test -z "$c1"; then
+      cmp -s "$cp_src" "$cp_dst" || {
+        # Copy the file first to get proper permissions if it
+        # doesn't already exist.  Then overwrite the copy.
+        echo "$me: cp -f $cp_src $cp_dst" &&
+        rm -f "$cp_dst" &&
+        cp "$cp_src" "$cp_dst-t" &&
+        sed "s!$bt_regex/!!g" "$cp_src" > "$cp_dst-t" &&
+        mv -f "$cp_dst-t" "$cp_dst"
+      }
+    else
+      # Copy the file first to get proper permissions if it
+      # doesn't already exist.  Then overwrite the copy.
+      cp "$cp_src" "$cp_dst-t" &&
+      (
+        echo "$c1-*- buffer-read-only: t -*- vi: set ro:$c2" &&
+        echo "${c1}DO NOT EDIT! GENERATED AUTOMATICALLY!$c2" &&
+        sed "s!$bt_regex/!!g" "$cp_src"
+      ) > $cp_dst-t &&
+      if cmp -s "$cp_dst-t" "$cp_dst"; then
+        rm -f "$cp_dst-t"
+      else
+        echo "$me: cp $cp_src $cp_dst # with edits" &&
+        mv -f "$cp_dst-t" "$cp_dst"
+      fi
+    fi
+  fi
+}
+
+version_controlled_file() {
+  dir=$1
+  file=$2
+  found=no
+  if test -d CVS; then
+    grep -F "/$file/" $dir/CVS/Entries 2>/dev/null |
+             grep '^/[^/]*/[0-9]' > /dev/null && found=yes
+  elif test -d .git; then
+    git rm -n "$dir/$file" > /dev/null 2>&1 && found=yes
+  elif test -d .svn; then
+    svn log -r HEAD "$dir/$file" > /dev/null 2>&1 && found=yes
+  else
+    echo "$me: no version control for $dir/$file?" >&2
+  fi
+  test $found = yes
+}
+
+slurp() {
+  for dir in . `(cd $1 && find * -type d -print)`; do
+    copied=
+    sep=
+    for file in `ls -a $1/$dir`; do
+      case $file in
+      .|..) continue;;
+      # FIXME: should all file names starting with "." be ignored?
+      .*) continue;;
+      esac
+      test -d $1/$dir/$file && continue
+      for excluded_file in $excluded_files; do
+        test "$dir/$file" = "$excluded_file" && continue 2
+      done
+      if test $file = Makefile.am && test "X$gnulib_mk" != XMakefile.am; then
+        copied=$copied${sep}$gnulib_mk; sep=$nl
+        remove_intl='/^[^#].*\/intl/s/^/#/;'"s!$bt_regex/!!g"
+        sed "$remove_intl" $1/$dir/$file |
+        cmp - $dir/$gnulib_mk > /dev/null || {
+          echo "$me: Copying $1/$dir/$file to $dir/$gnulib_mk ..." &&
+          rm -f $dir/$gnulib_mk &&
+          sed "$remove_intl" $1/$dir/$file >$dir/$gnulib_mk &&
+          gnulib_mk_hook $dir/$gnulib_mk
+        }
+      elif { test "${2+set}" = set && test -r $2/$dir/$file; } ||
+           version_controlled_file $dir $file; then
+        echo "$me: $dir/$file overrides $1/$dir/$file"
+      else
+        copied=$copied$sep$file; sep=$nl
+        if test $file = gettext.m4; then
+          echo "$me: patching m4/gettext.m4 to remove need for intl/* ..."
+          rm -f $dir/$file
+          sed '
+            /^AC_DEFUN(\[AM_INTL_SUBDIR],/,/^]/c\
+              AC_DEFUN([AM_INTL_SUBDIR], [])
+            /^AC_DEFUN(\[gt_INTL_SUBDIR_CORE],/,/^]/c\
+              AC_DEFUN([gt_INTL_SUBDIR_CORE], [])
+            $a\
+              AC_DEFUN([gl_LOCK_EARLY], [])
+          ' $1/$dir/$file >$dir/$file
+        else
+          cp_mark_as_generated $1/$dir/$file $dir/$file
+        fi
+      fi || exit
+    done
+
+    for dot_ig in x $vc_ignore; do
+      test $dot_ig = x && continue
+      ig=$dir/$dot_ig
+      if test -n "$copied"; then
+        insert_vc_ignore $ig "$copied"
+        # If an ignored file name ends with .in.h, then also add
+        # the name with just ".h".  Many gnulib headers are generated,
+        # e.g., stdint.in.h -> stdint.h, dirent.in.h ->..., etc.
+        # Likewise for .gperf -> .h, .y -> .c, and .sin -> .sed
+        f=`echo "$copied" |
+          sed '
+            s/\.in\.h$/.h/
+            s/\.sin$/.sed/
+            s/\.y$/.c/
+            s/\.gperf$/.h/
+          '
+        `
+        insert_vc_ignore $ig "$f"
+
+        # For files like sys_stat.in.h and sys_time.in.h, record as
+        # ignorable the directory we might eventually create: sys/.
+        f=`echo "$copied"|sed 's/sys_.*\.in\.h$/sys/'`
+        insert_vc_ignore $ig "$f"
+      fi
+    done
+  done
+}
+
+
+# Create boot temporary directories to import from gnulib and gettext.
+rm -fr $bt $bt2 &&
+mkdir $bt $bt2 || exit
+
+# Import from gnulib.
+
+gnulib_tool_options="\
+ --import\
+ --no-changelog\
+ --aux-dir $bt/$build_aux\
+ --doc-base $bt/$doc_base\
+ --lib $gnulib_name\
+ --m4-base $bt/$m4_base/\
+ --source-base $bt/$source_base/\
+ --tests-base $bt/$tests_base\
+ --local-dir $local_gl_dir\
+ $gnulib_tool_option_extras\
+"
+if test $use_libtool = 1; then
+  case "$gnulib_tool_options " in
+    *' --libtool '*) ;;
+    *) gnulib_tool_options="$gnulib_tool_options --libtool" ;;
+  esac
+fi
+echo "$0: $gnulib_tool $gnulib_tool_options --import ..."
+$gnulib_tool $gnulib_tool_options --import $gnulib_modules &&
+slurp $bt || exit
+
+for file in $gnulib_files; do
+  symlink_to_dir "$GNULIB_SRCDIR" $file || exit
+done
+
+
+# Import from gettext.
+with_gettext=yes
+grep '^[	 ]*AM_GNU_GETTEXT_VERSION(' configure.ac >/dev/null || \
+    with_gettext=no
+
+if test $with_gettext = yes; then
+  echo "$0: (cd $bt2; ${AUTOPOINT-autopoint}) ..."
+  cp configure.ac $bt2 &&
+  (cd $bt2 && ${AUTOPOINT-autopoint} && rm configure.ac) &&
+  slurp $bt2 $bt || exit
+fi
+rm -fr $bt $bt2 || exit
+
+# Remove any dangling symlink matching "*.m4" or "*.[ch]" in some
+# gnulib-populated directories.  Such .m4 files would cause aclocal to fail.
+# The following requires GNU find 4.2.3 or newer.  Considering the usual
+# portability constraints of this script, that may seem a very demanding
+# requirement, but it should be ok.  Ignore any failure, which is fine,
+# since this is only a convenience to help developers avoid the relatively
+# unusual case in which a symlinked-to .m4 file is git-removed from gnulib
+# between successive runs of this script.
+find "$m4_base" "$source_base" \
+  -depth \( -name '*.m4' -o -name '*.[ch]' \) \
+  -type l -xtype l -delete > /dev/null 2>&1
+
+# Reconfigure, getting other files.
+
+# Skip autoheader if it's not needed.
+grep -E '^[	 ]*AC_CONFIG_HEADERS?\>' configure.ac >/dev/null ||
+  AUTOHEADER=true
+
+for command in \
+  libtool \
+  "${ACLOCAL-aclocal} --force -I m4 $ACLOCAL_FLAGS" \
+  "${AUTOCONF-autoconf} --force" \
+  "${AUTOHEADER-autoheader} --force" \
+  "${AUTOMAKE-automake} --add-missing --copy --force-missing"
+do
+  if test "$command" = libtool; then
+    test $use_libtool = 0 \
+      && continue
+    command="${LIBTOOLIZE-libtoolize} -c -f"
+  fi
+  echo "$0: $command ..."
+  $command || exit
+done
+
+
+# Get some extra files from gnulib, overriding existing files.
+for file in $gnulib_extra_files; do
+  case $file in
+  */INSTALL) dst=INSTALL;;
+  build-aux/*) dst=$build_aux/`expr "$file" : 'build-aux/\(.*\)'`;;
+  *) dst=$file;;
+  esac
+  symlink_to_dir "$GNULIB_SRCDIR" $file $dst || exit
+done
+
+if test $with_gettext = yes; then
+  # Create gettext configuration.
+  echo "$0: Creating po/Makevars from po/Makevars.template ..."
+  rm -f po/Makevars
+  sed '
+    /^EXTRA_LOCALE_CATEGORIES *=/s/=.*/= '"$EXTRA_LOCALE_CATEGORIES"'/
+    /^COPYRIGHT_HOLDER *=/s/=.*/= '"$COPYRIGHT_HOLDER"'/
+    /^MSGID_BUGS_ADDRESS *=/s|=.*|= '"$MSGID_BUGS_ADDRESS"'|
+    /^XGETTEXT_OPTIONS *=/{
+      s/$/ \\/
+      a\
+          '"$XGETTEXT_OPTIONS"' $${end_of_xgettext_options+}
+    }
+  ' po/Makevars.template >po/Makevars || exit 1
+
+  if test -d runtime-po; then
+    # Similarly for runtime-po/Makevars, but not quite the same.
+    rm -f runtime-po/Makevars
+    sed '
+      /^DOMAIN *=.*/s/=.*/= '"$package"'-runtime/
+      /^subdir *=.*/s/=.*/= runtime-po/
+      /^MSGID_BUGS_ADDRESS *=/s/=.*/= bug-'"$package"'@gnu.org/
+      /^XGETTEXT_OPTIONS *=/{
+        s/$/ \\/
+        a\
+            '"$XGETTEXT_OPTIONS_RUNTIME"' $${end_of_xgettext_options+}
+      }
+    ' po/Makevars.template >runtime-po/Makevars || exit 1
+
+    # Copy identical files from po to runtime-po.
+    (cd po && cp -p Makefile.in.in *-quot *.header *.sed *.sin ../runtime-po)
+  fi
+fi
+
+bootstrap_epilogue
 
-$gnulib_tool			\
-  --avoid=dummy			\
-  --with-tests			\
-  --m4-base=m4			\
-  --source-base=gnulib/lib	\
-  --tests-base=gnulib/tests	\
-  --import $modules
+echo "$0: done.  Now you can run './configure'."
 
-# Disable autopoint and libtoolize, since they were already done above.
-AUTOPOINT=true LIBTOOLIZE=true autoreconf --verbose --install
+# Local variables:
+# eval: (add-hook 'write-file-hooks 'time-stamp)
+# time-stamp-start: "scriptversion="
+# time-stamp-format: "%:y-%02m-%02d.%02H"
+# time-stamp-time-zone: "UTC"
+# time-stamp-end: "; # UTC"
+# End:
diff --git a/bootstrap.conf b/bootstrap.conf
new file mode 100644
index 0000000..5d6f04c
--- /dev/null
+++ b/bootstrap.conf
@@ -0,0 +1,109 @@
+# Bootstrap configuration. -*- shell-script -*-
+
+# Copyright (C) 2006-2007, 2009-2011 Free Software Foundation, Inc.
+
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3 of the License, or
+# (at your option) any later version.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+
+# gnulib modules used by this package.
+gnulib_modules="
+arpa_inet
+c-ctype
+closeout
+error
+filevercmp
+fts
+full-read
+full-write
+gitlog-to-changelog
+gnu-make
+gnumakefile
+hash
+hash-pjw
+human
+ignore-value
+lock
+maintainer-makefile
+manywarnings
+netinet_in
+progname
+setenv
+strchrnul
+strerror
+strndup
+vasprintf
+vc-list-files
+warnings
+xalloc
+xalloc-die
+xstrtol
+xstrtoll
+xvasprintf
+"
+
+# Additional xgettext options to use.  Use "\\\newline" to break lines.
+XGETTEXT_OPTIONS=$XGETTEXT_OPTIONS'\\\
+ --from-code=UTF-8\\\
+ --flag=asprintf:2:c-format --flag=vasprintf:2:c-format\\\
+ --flag=asnprintf:3:c-format --flag=vasnprintf:3:c-format\\\
+ --flag=wrapf:1:c-format\\\
+'
+
+# If "AM_GNU_GETTEXT(external" or "AM_GNU_GETTEXT([external]"
+# appears in configure.ac, exclude some unnecessary files.
+# Without grep's -E option (not portable enough, pre-configure),
+# the following test is ugly.  Also, this depends on the existence
+# of configure.ac, not the obsolescent-named configure.in.  But if
+# you're using this infrastructure, you should care about such things.
+
+gettext_external=0
+grep '^[	 ]*AM_GNU_GETTEXT(external\>' configure.ac > /dev/null &&
+  gettext_external=1
+grep '^[	 ]*AM_GNU_GETTEXT(\[external\]' configure.ac > /dev/null &&
+  gettext_external=1
+
+if test $gettext_external = 1; then
+  # Gettext supplies these files, but we don't need them since
+  # we don't have an intl subdirectory.
+  excluded_files='
+      m4/glibc2.m4
+      m4/intdiv0.m4
+      m4/lcmessage.m4
+      m4/lock.m4
+      m4/printf-posix.m4
+      m4/size_max.m4
+      m4/uintmax_t.m4
+      m4/ulonglong.m4
+      m4/visibility.m4
+      m4/xsize.m4
+  '
+fi
+
+# Build prerequisites
+buildreq="\
+autoconf   2.59
+automake   1.9.6
+git        1.5.5
+tar        -
+"
+
+# RWMJ:
+source_base=gnulib/lib
+tests_base=gnulib/tests
+gnulib_tool_option_extras="
+--avoid=dummy
+--with-tests
+"
+checkout_only_file=.git/config
+SKIP_PO=t
\ No newline at end of file
diff --git a/capitests/Makefile.am b/capitests/Makefile.am
index 542c4fb..2dabae8 100644
--- a/capitests/Makefile.am
+++ b/capitests/Makefile.am
@@ -111,7 +111,7 @@ test_last_errno_LDADD = \
 #	$(WARN_CFLAGS) $(WERROR_CFLAGS)
 #test_add_libvirt_dom_LDADD = \
 #	$(top_builddir)/src/libguestfs.la $(LIBVIRT_LIBS) \
-#	$(LTLIBTHREAD) ../gnulib/lib/libgnu.la
+#	$(LTLIBTHREAD) ../gnulib/lib/liblibguestfs.la
 #endif
 
 # Run the tests under valgrind.
diff --git a/cat/Makefile.am b/cat/Makefile.am
index 026a561..34d085a 100644
--- a/cat/Makefile.am
+++ b/cat/Makefile.am
@@ -52,7 +52,7 @@ virt_cat_CFLAGS = \
 
 virt_cat_LDADD = \
 	$(top_builddir)/src/libguestfs.la \
-	../gnulib/lib/libgnu.la
+	../gnulib/lib/liblibguestfs.la
 
 virt_filesystems_SOURCES = \
 	$(SHARED_SOURCE_FILES) \
@@ -67,7 +67,7 @@ virt_filesystems_CFLAGS = \
 
 virt_filesystems_LDADD = \
 	$(top_builddir)/src/libguestfs.la \
-	../gnulib/lib/libgnu.la
+	../gnulib/lib/liblibguestfs.la
 
 virt_ls_SOURCES = \
 	$(SHARED_SOURCE_FILES) \
@@ -82,7 +82,7 @@ virt_ls_CFLAGS = \
 
 virt_ls_LDADD = \
 	$(top_builddir)/src/libguestfs.la \
-	../gnulib/lib/libgnu.la
+	../gnulib/lib/liblibguestfs.la
 
 # Manual pages and HTML files for the website.
 man_MANS = virt-cat.1 virt-filesystems.1 virt-ls.1
diff --git a/daemon/.gitignore b/daemon/.gitignore
index e06c684..d0ba156 100644
--- a/daemon/.gitignore
+++ b/daemon/.gitignore
@@ -5,6 +5,7 @@ m4/00gnulib.m4
 m4/alloca.m4
 m4/arpa_inet_h.m4
 m4/asm-underscore.m4
+m4/btowc.m4
 m4/byteswap.m4
 m4/canonicalize-lgpl.m4
 m4/chdir-long.m4
@@ -13,6 +14,7 @@ m4/clock_time.m4
 m4/cloexec.m4
 m4/close.m4
 m4/codeset.m4
+m4/configmake.m4
 m4/d-ino.m4
 m4/d-type.m4
 m4/dirent_h.m4
@@ -22,20 +24,23 @@ m4/dos.m4
 m4/double-slash-root.m4
 m4/dup2.m4
 m4/eealloc.m4
+m4/environ.m4
 m4/errno_h.m4
 m4/error.m4
 m4/exitfail.m4
 m4/extensions.m4
 m4/fchdir.m4
 m4/fclose.m4
-m4/fcntl_h.m4
-m4/fcntl-safer.m4
 m4/fcntl-o.m4
+m4/fcntl-safer.m4
 m4/fcntl.m4
+m4/fcntl_h.m4
 m4/fdopendir.m4
 m4/float_h.m4
 m4/fnmatch.m4
+m4/fseeko.m4
 m4/fsusage.m4
+m4/ftello.m4
 m4/futimens.m4
 m4/getaddrinfo.m4
 m4/getcwd-abort-bug.m4
@@ -46,9 +51,9 @@ m4/getdtablesize.m4
 m4/getgroups.m4
 m4/getline.m4
 m4/getlogin_r.m4
+m4/getpagesize.m4
 m4/gettime.m4
 m4/gettimeofday.m4
-m4/getpagesize.m4
 m4/getugroups.m4
 m4/glibc21.m4
 m4/glob.m4
@@ -61,15 +66,25 @@ m4/include_next.m4
 m4/inet_ntop.m4
 m4/inet_pton.m4
 m4/inline.m4
+m4/intlmacosx.m4
 m4/intmax_t.m4
 m4/inttostr.m4
+m4/inttypes-pri.m4
+m4/inttypes.m4
 m4/inttypes_h.m4
 m4/ioctl.m4
 m4/lchown.m4
+m4/lcmessage.m4
+m4/lib-ld.m4
+m4/lib-link.m4
+m4/lib-prefix.m4
 m4/localcharset.m4
 m4/locale-fr.m4
 m4/locale-ja.m4
 m4/locale-zh.m4
+m4/locale_h.m4
+m4/localename.m4
+m4/lock.m4
 m4/longlong.m4
 m4/lseek.m4
 m4/lstat.m4
@@ -80,6 +95,7 @@ m4/mbrtowc.m4
 m4/mbsinit.m4
 m4/mbsrtowcs.m4
 m4/mbstate_t.m4
+m4/mbtowc.m4
 m4/memchr.m4
 m4/mempcpy.m4
 m4/memrchr.m4
@@ -96,12 +112,14 @@ m4/open.m4
 m4/openat.m4
 m4/pathmax.m4
 m4/perror.m4
+m4/pipe.m4
 m4/pread.m4
 m4/printf.m4
 m4/priv-set.m4
+m4/putenv.m4
 m4/rawmemchr.m4
-m4/readlink.m4
 m4/read-file.m4
+m4/readlink.m4
 m4/realloc.m4
 m4/rmdir.m4
 m4/safe-read.m4
@@ -109,19 +127,22 @@ m4/safe-write.m4
 m4/save-cwd.m4
 m4/select.m4
 m4/servent.m4
+m4/setenv.m4
+m4/setlocale.m4
 m4/size_max.m4
 m4/sleep.m4
+m4/snprintf.m4
+m4/socketlib.m4
 m4/sockets.m4
 m4/socklen.m4
 m4/sockpfaf.m4
-m4/snprintf.m4
 m4/ssize_t.m4
 m4/stat-time.m4
 m4/stat.m4
 m4/stdbool.m4
 m4/stddef_h.m4
-m4/stdint_h.m4
 m4/stdint.m4
+m4/stdint_h.m4
 m4/stdio_h.m4
 m4/stdlib_h.m4
 m4/strchrnul.m4
@@ -139,8 +160,11 @@ m4/sys_stat_h.m4
 m4/sys_time_h.m4
 m4/sys_wait_h.m4
 m4/tempname.m4
+m4/thread.m4
+m4/threadlib.m4
 m4/time_h.m4
 m4/timespec.m4
+m4/ungetc.m4
 m4/unistd-safer.m4
 m4/unistd_h.m4
 m4/unlink.m4
@@ -152,12 +176,14 @@ m4/utimens.m4
 m4/utimes.m4
 m4/vasnprintf.m4
 m4/vasprintf.m4
-m4/warnings.m4
 m4/warn-on-use.m4
+m4/warnings.m4
 m4/wchar.m4
 m4/wchar_h.m4
 m4/wchar_t.m4
+m4/wcrtomb.m4
 m4/wctob.m4
+m4/wctomb.m4
 m4/wctype.m4
 m4/wctype_h.m4
 m4/wint_t.m4
@@ -166,5 +192,6 @@ m4/xalloc.m4
 m4/xgetcwd.m4
 m4/xsize.m4
 m4/xstrndup.m4
+m4/yield.m4
 mingw32-config.cache
 tests
diff --git a/daemon/m4/gnulib-cache.m4 b/daemon/m4/gnulib-cache.m4
index f026cb3..f262b08 100644
--- a/daemon/m4/gnulib-cache.m4
+++ b/daemon/m4/gnulib-cache.m4
@@ -1,4 +1,4 @@
-# Copyright (C) 2002-2010 Free Software Foundation, Inc.
+# Copyright (C) 2002-2011 Free Software Foundation, Inc.
 #
 # This file is free software, distributed under the terms of the GNU
 # General Public License.  As a special exception to the GNU General
@@ -10,8 +10,8 @@
 #
 # This file represents the specification of how gnulib-tool is used.
 # It acts as a cache: It is written and read by gnulib-tool.
-# In projects using CVS, this file is meant to be stored in CVS,
-# like the configure.ac and various Makefile.am files.
+# In projects that use version control, this file is meant to be put under
+# version control, like the configure.ac and various Makefile.am files.
 
 
 # Specification in the form of a command-line invocation:
diff --git a/df/Makefile.am b/df/Makefile.am
index 2f0eff0..a4ff1ef 100644
--- a/df/Makefile.am
+++ b/df/Makefile.am
@@ -52,7 +52,7 @@ virt_df_CFLAGS = \
 
 virt_df_LDADD = \
 	$(top_builddir)/src/libguestfs.la \
-	../gnulib/lib/libgnu.la \
+	../gnulib/lib/liblibguestfs.la \
 	$(LIBVIRT_LIBS) \
 	-lm
 
diff --git a/fish/Makefile.am b/fish/Makefile.am
index 972b13d..bec73fb 100644
--- a/fish/Makefile.am
+++ b/fish/Makefile.am
@@ -120,7 +120,7 @@ guestfish_LDADD = \
 
 # Make guestfish use the convenience libraries.
 noinst_LTLIBRARIES = libcmds.la librc_protocol.la
-guestfish_LDADD += libcmds.la librc_protocol.la ../gnulib/lib/libgnu.la
+guestfish_LDADD += libcmds.la librc_protocol.la ../gnulib/lib/liblibguestfs.la
 
 if HAVE_RPCGEN
 rc_protocol.c: rc_protocol.x
diff --git a/fuse/Makefile.am b/fuse/Makefile.am
index 7d3b463..45299f4 100644
--- a/fuse/Makefile.am
+++ b/fuse/Makefile.am
@@ -53,7 +53,7 @@ guestmount_CFLAGS = \
 guestmount_LDADD = \
 	$(FUSE_LIBS) -lulockmgr \
 	$(top_builddir)/src/libguestfs.la \
-	../gnulib/lib/libgnu.la
+	../gnulib/lib/liblibguestfs.la
 
 # Documentation.
 
diff --git a/gnulib/lib/Makefile.am b/gnulib/lib/Makefile.am
new file mode 100644
index 0000000..6635f70
--- /dev/null
+++ b/gnulib/lib/Makefile.am
@@ -0,0 +1 @@
+include gnulib.mk
diff --git a/gnulib/tests/Makefile.am b/gnulib/tests/Makefile.am
new file mode 100644
index 0000000..6635f70
--- /dev/null
+++ b/gnulib/tests/Makefile.am
@@ -0,0 +1 @@
+include gnulib.mk
diff --git a/inspector/Makefile.am b/inspector/Makefile.am
index 24dcdef..9302e32 100644
--- a/inspector/Makefile.am
+++ b/inspector/Makefile.am
@@ -69,7 +69,7 @@ virt_inspector_CFLAGS = \
 virt_inspector_LDADD = \
 	$(top_builddir)/src/libguestfs.la \
 	$(LIBXML2_LIBS) \
-	../gnulib/lib/libgnu.la
+	../gnulib/lib/liblibguestfs.la
 
 # Manual pages and HTML files for the website.
 man_MANS = virt-inspector.1
diff --git a/m4/.gitignore b/m4/.gitignore
index 2ab011d..3332e90 100644
--- a/m4/.gitignore
+++ b/m4/.gitignore
@@ -1,180 +1,202 @@
-codeset.m4
-gettext.m4
-glibc21.m4
-iconv.m4
-intdiv0.m4
-inttypes-pri.m4
-inttypes.m4
-inttypes_h.m4
-isc-posix.m4
-lcmessage.m4
-lib-ld.m4
-lib-link.m4
-lib-prefix.m4
-longdouble.m4
-longlong.m4
-nls.m4
-po.m4
-printf-posix.m4
-progtest.m4
-signed.m4
-size_max.m4
-stdint_h.m4
-uintmax_t.m4
-ulonglong.m4
-wchar_t.m4
-wint_t.m4
-xsize.m4
 /00gnulib.m4
 /alloca.m4
+/argmatch.m4
+/arpa_inet_h.m4
+/asm-underscore.m4
+/btowc.m4
+/canonicalize-lgpl.m4
+/chdir-long.m4
+/chown.m4
+/cloexec.m4
 /close-stream.m4
+/close.m4
 /closeout.m4
+/codeset.m4
+/configmake.m4
+/cycle-check.m4
+/d-ino.m4
+/d-type.m4
+/dirent-safer.m4
+/dirent_h.m4
+/dirfd.m4
+/dirname.m4
+/dos.m4
+/double-slash-root.m4
+/dup2.m4
 /eealloc.m4
 /environ.m4
 /errno_h.m4
 /error.m4
 /exitfail.m4
 /extensions.m4
+/fchdir.m4
+/fclose.m4
+/fcntl-o.m4
+/fcntl-safer.m4
+/fcntl.m4
+/fcntl_h.m4
+/fdopendir.m4
 /float_h.m4
 /fpending.m4
+/fts.m4
+/getcwd-abort-bug.m4
+/getcwd-path-max.m4
+/getcwd.m4
+/getdtablesize.m4
+/getgroups.m4
+/getopt.m4
 /getpagesize.m4
+/getugroups.m4
 /glibc2.m4
+/glibc21.m4
 /gnu-make.m4
+/gnulib-cache.m4
 /gnulib-common.m4
 /gnulib-comp.m4
 /gnulib-tool.m4
+/hash.m4
+/human.m4
+/i-ring.m4
 /include_next.m4
 /inline.m4
 /intl.m4
 /intldir.m4
 /intlmacosx.m4
+/intmax.m4
 /intmax_t.m4
+/inttostr.m4
+/inttypes-pri.m4
+/inttypes.m4
+/inttypes_h.m4
+/lchown.m4
+/lib-ld.m4
+/lib-link.m4
+/lib-prefix.m4
 /localcharset.m4
 /locale-fr.m4
 /locale-ja.m4
 /locale-zh.m4
+/locale_h.m4
+/localename.m4
 /lock.m4
+/longlong.m4
+/lstat.m4
+/malloc.m4
 /malloca.m4
 /manywarnings.m4
 /mbrtowc.m4
 /mbsinit.m4
 /mbstate_t.m4
+/mbtowc.m4
 /memchr.m4
+/mempcpy.m4
+/memrchr.m4
+/mgetgroups.m4
+/mkdir.m4
 /mmap-anon.m4
+/mode_t.m4
 /multiarch.m4
+/netinet_in_h.m4
 /onceonly.m4
+/open.m4
+/openat.m4
+/pathmax.m4
+/printf.m4
+/priv-set.m4
+/putenv.m4
+/quote.m4
 /quotearg.m4
 /rawmemchr.m4
+/readlink.m4
+/realloc.m4
+/rmdir.m4
+/safe-read.m4
+/safe-write.m4
+/save-cwd.m4
 /setenv.m4
+/setlocale.m4
+/sleep.m4
+/snprintf.m4
+/socklen.m4
+/sockpfaf.m4
+/ssize_t.m4
+/stat-time.m4
+/stat.m4
+/stdarg.m4
 /stdbool.m4
 /stddef_h.m4
 /stdint.m4
+/stdint_h.m4
 /stdio_h.m4
 /stdlib_h.m4
 /strchrnul.m4
+/strdup.m4
 /strerror.m4
 /string_h.m4
 /strndup.m4
 /strnlen.m4
+/strtoimax.m4
+/strtol.m4
+/strtoll.m4
+/strtoul.m4
+/strtoull.m4
+/strtoumax.m4
+/symlink.m4
+/sys_socket_h.m4
+/sys_stat_h.m4
+/thread.m4
 /threadlib.m4
+/time_h.m4
+/unistd-safer.m4
 /unistd_h.m4
+/unlink.m4
+/unlinkdir.m4
+/usleep.m4
 /vasnprintf.m4
 /vasprintf.m4
 /visibility.m4
+/warn-on-use.m4
 /warnings.m4
 /wchar.m4
+/wchar_h.m4
+/wchar_t.m4
+/wcrtomb.m4
 /wctob.m4
+/wctomb.m4
 /wctype.m4
+/wctype_h.m4
+/wint_t.m4
+/write.m4
 /xalloc.m4
-/arpa_inet_h.m4
-/netinet_in_h.m4
-/sockpfaf.m4
-/sys_socket_h.m4
-/canonicalize-lgpl.m4
-/chdir-long.m4
-/chown.m4
-/close.m4
-/d-ino.m4
-/dirent_h.m4
-/dirfd.m4
-/dirname.m4
-/dos.m4
-/double-slash-root.m4
-/dup2.m4
-/fchdir.m4
-/fclose.m4
-/fcntl-safer.m4
-/fcntl_h.m4
-/getcwd-abort-bug.m4
-/getcwd-path-max.m4
-/getcwd.m4
-/lchown.m4
-/lstat.m4
-/malloc.m4
-/mempcpy.m4
-/memrchr.m4
-/mode_t.m4
-/open.m4
-/openat.m4
-/pathmax.m4
-/readlink.m4
-/save-cwd.m4
-/sys_stat_h.m4
-/unistd-safer.m4
 /xgetcwd.m4
 /xstrndup.m4
-/hash.m4
-/inttostr.m4
-/putenv.m4
-/thread.m4
-/yield.m4
-/fcntl-o.m4
-/warn-on-use.m4
-/getopt.m4
-/stat.m4
-/symlink.m4
-/time_h.m4
-/xstrtol.m4
-/safe-read.m4
-/safe-write.m4
-/ssize_t.m4
-/write.m4
-/strtol.m4
-/strtoll.m4
-/strtoul.m4
-/strtoull.m4
 /xstrtol.m4
-/cloexec.m4
-/cycle-check.m4
-/d-type.m4
-/dirent-safer.m4
-/fcntl.m4
-/fdopendir.m4
-/fts.m4
-/getdtablesize.m4
-/getgroups.m4
-/getugroups.m4
-/i-ring.m4
-/mgetgroups.m4
-/mkdir.m4
-/priv-set.m4
-/realloc.m4
-/rmdir.m4
-/sleep.m4
-/stat-time.m4
-/strdup.m4
-/unlink.m4
-/unlinkdir.m4
-/usleep.m4
-/stdarg.m4
 /xvasprintf.m4
-/intmax.m4
-/printf.m4
-/wchar_h.m4
-/wctype_h.m4
-/asm-underscore.m4
-/argmatch.m4
-/human.m4
-/quote.m4
-/strtoimax.m4
-/strtoumax.m4
+/yield.m4
+codeset.m4
+gettext.m4
+glibc21.m4
+iconv.m4
+intdiv0.m4
+inttypes-pri.m4
+inttypes.m4
+inttypes_h.m4
+isc-posix.m4
+lcmessage.m4
+lib-ld.m4
+lib-link.m4
+lib-prefix.m4
+longdouble.m4
+longlong.m4
+nls.m4
+po.m4
+printf-posix.m4
+progtest.m4
+signed.m4
+size_max.m4
+stdint_h.m4
+uintmax_t.m4
+ulonglong.m4
+wchar_t.m4
+wint_t.m4
+xsize.m4
diff --git a/rescue/Makefile.am b/rescue/Makefile.am
index f6f5b25..096c8ce 100644
--- a/rescue/Makefile.am
+++ b/rescue/Makefile.am
@@ -45,7 +45,7 @@ virt_rescue_CFLAGS = \
 
 virt_rescue_LDADD = \
 	$(top_builddir)/src/libguestfs.la \
-	../gnulib/lib/libgnu.la
+	../gnulib/lib/liblibguestfs.la
 
 # Manual pages and HTML files for the website.
 man_MANS = virt-rescue.1
diff --git a/src/Makefile.am b/src/Makefile.am
index 2b9c49b..4ac96b8 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -138,7 +138,7 @@ libguestfs_la_SOURCES = \
 libguestfs_la_LIBADD = \
 	$(HIVEX_LIBS) $(AUGEAS_LIBS) $(PCRE_LIBS) $(MAGIC_LIBS) \
 	$(LIBVIRT_LIBS) $(LIBXML2_LIBS) \
-	$(LTLIBTHREAD) ../gnulib/lib/libgnu.la
+	$(LTLIBTHREAD) ../gnulib/lib/liblibguestfs.la
 
 # Make libguestfs include the convenience libraries.
 noinst_LTLIBRARIES = liberrnostring.la libprotocol.la
-- 
1.7.4


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]