[PATCH 1/9] Don't display a separate gnulib version.

[James Youngman]

* lib/findutils-version.c (display_findutils_version): Don't
display gnulib_version because it's no longer defined (because
there is no gnulib version separate from the findutils version,
now that gnulib is a submodule).
* import-gnulib.config: remove gnulib_version and destdir, they
are not needed any more.
* lib/Makefile.am (EXTRA_DIST): Don't distribute gnulib-version.h
or gnulib-version.c.
(BUILT_SOURCES): delete, there are no longer any built sources.
* lib/gnulib-version.h: Remove.
* locate/code.c: Don't include gnulib-version.h
* xargs/xargs.c: Don't include gnulib-version.h
---
 ChangeLog               |   16 ++++++++++++++++
 import-gnulib.config    |    4 ----
 lib/Makefile.am         |    5 ++---
 lib/findutils-version.c |    4 ----
 lib/gnulib-version.h    |   18 ------------------
 locate/code.c           |    1 -
 xargs/xargs.c           |    1 -
 7 files changed, 18 insertions(+), 31 deletions(-)
 delete mode 100644 lib/gnulib-version.h

diff --git a/ChangeLog b/ChangeLog
index 47273de..04b964a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,19 @@
+2011-06-03  James Youngman  <address@hidden>
+
+       Don't display a separate gnulib version.
+       * lib/findutils-version.c (display_findutils_version): Don't
+       display gnulib_version because it's no longer defined (because
+       there is no gnulib version separate from the findutils version,
+       now that gnulib is a submodule).
+       * import-gnulib.config: remove gnulib_version and destdir, they
+       are not needed any more.
+       * lib/Makefile.am (EXTRA_DIST): Don't distribute gnulib-version.h
+       or gnulib-version.c.
+       (BUILT_SOURCES): delete, there are no longer any built sources.
+       * lib/gnulib-version.h: Remove.
+       * locate/code.c: Don't include gnulib-version.h
+       * xargs/xargs.c: Don't include gnulib-version.h
+
 2011-06-01  James Youngman  <address@hidden>
 
        Take the last matching entry in /etc/mtab, not the first.
diff --git a/import-gnulib.config b/import-gnulib.config
index 44c9044..e7f351d 100644
--- a/import-gnulib.config
+++ b/import-gnulib.config
@@ -1,9 +1,5 @@
 # findutils gnulib.config -*- sh -*-
 
-# What version of gnulib to use?
-gnulib_version="533fd9cee8195db5cfa76b30fd0c6bcee583163c"
-destdir="gnulib"
-
 # Random extra gnulib files needed for findutils.
 extra_files='
 build-aux/config.guess
diff --git a/lib/Makefile.am b/lib/Makefile.am
index 2196731..9aa578e 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -18,11 +18,10 @@ else
 TESTS += check-regexprops
 endif
 
-libfind_a_SOURCES = gnulib-version.c findutils-version.c
+libfind_a_SOURCES = findutils-version.c
 EXTRA_DIST = extendbuf.h savedirinfo.h buildcmd.h \
-       gnulib-version.h gnulib-version.c findutils-version.h \
+       findutils-version.h \
        fdleak.h unused-result.h check-regexprops.sh
-BUILT_SOURCES = gnulib-version.c
 SUFFIXES =
 MOSTLYCLEANFILES =
 CLEANFILES = check-regexprops
diff --git a/lib/findutils-version.c b/lib/findutils-version.c
index f3ada25..5b8d4c6 100644
--- a/lib/findutils-version.c
+++ b/lib/findutils-version.c
@@ -18,9 +18,6 @@
 #include <config.h>
 #include "stdio-safer.h"
 #include "version-etc.h"
-#include "gnulib-version.h"
-
-
 
 #if ENABLE_NLS
 # include <libintl.h>
@@ -61,5 +58,4 @@ display_findutils_version (const char *official_name)
               _("James Youngman"),
               _("Kevin Dalley"),
               (const char*) NULL);
-  printf (_("Built using GNU gnulib version %s\n"), gnulib_version);
 }
diff --git a/lib/gnulib-version.h b/lib/gnulib-version.h
deleted file mode 100644
index 73466c3..0000000
--- a/lib/gnulib-version.h
+++ /dev/null
@@ -1,18 +0,0 @@
-/* gnulib-version.h
-   Copyright (C) 2007, 2010 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/>.
-*/
-
-extern const char * const gnulib_version;
diff --git a/locate/code.c b/locate/code.c
index 7d06a66..7096d73 100644
--- a/locate/code.c
+++ b/locate/code.c
@@ -73,7 +73,6 @@
 #include "locatedb.h"
 #include "closeout.h"
 #include "xalloc.h"
-#include "gnulib-version.h"
 #include "progname.h"
 #include "error.h"
 #include "findutils-version.h"
diff --git a/xargs/xargs.c b/xargs/xargs.c
index 97f530f..120483e 100644
--- a/xargs/xargs.c
+++ b/xargs/xargs.c
@@ -98,7 +98,6 @@
 
 #include <xalloc.h>
 #include "closein.h"
-#include "gnulib-version.h"
 
 void error (int status, int errnum, char *message,...);
 
-- 
1.7.2.5