Fixes to ensure that 'make distcheck' works

Makefile.am

@@ -4,7 +4,7 @@ AUTOMAKE_OPTIONS=gnits
 EXTRA_DIST = COPYING ChangeLog TODO config.h.in stamp-h.in \
 		THANKS import-gnulib.sh import-gnulib.config
 # "tests" is the gnulib unit test dir.
-SUBDIRS = gnulib tests lib find xargs locate doc po m4
+SUBDIRS = gnulib tests build-aux lib find xargs locate doc po m4 
 
 ACLOCAL_AMFLAGS = -I gnulib/m4 -I m4
 

build-aux/Makefile.am

@@ -0,0 +1 @@
+EXTRA_DIST = check-testfiles.sh

configure.in

@@ -230,7 +230,7 @@ AC_DEFINE([FINDUTILS], 1, [Define if we are compiling GNU findutils])
 AC_CONFIG_FILES(gnulib/Makefile gnulib/lib/Makefile)
 AC_CONFIG_FILES(m4/Makefile)
 AC_CONFIG_FILES([Makefile 
-         tests/Makefile
+         tests/Makefile build-aux/Makefile
 	find/Makefile find/testsuite/Makefile
 	xargs/Makefile xargs/testsuite/Makefile
 	locate/Makefile locate/testsuite/Makefile

doc/Makefile.am

@@ -1,5 +1,5 @@
 info_TEXINFOS = find.texi
-find_TEXINFOS = perm.texi regexprops.texi
+find_TEXINFOS = perm.texi getdate.texi regexprops.texi
 MOSTLYCLEANFILES = find.cps 
 CLEANFILES = find.txt find_mono.html findutils.texi_html_node.tar.gz regexprops.texi
 

find/testsuite/find.gnu/execdir-in-unreadable.exp

@@ -0,0 +1,9 @@
+# tests for -execdir ... \+ in a directory which is not readable
+exec rm -rf tmp
+exec mkdir tmp
+exec chmod 755 tmp
+exec mkdir tmp/sub
+exec chmod 300 tmp/sub
+find_start p { tmp -maxdepth 1 -execdir true \{\} \+ }
+exec chmod 700 tmp/sub
+exec rm -rf tmp

import-gnulib.config

@@ -1,16 +1,16 @@
 # What version of gnulib to use?
-gnulib_version="2007-04-03"
+gnulib_version="2007-04-14"
 
 destdir="gnulib"
 
 # Random extra gnulib files needed for findutils.
 extra_files='
 build-aux/config.guess
-build-aux/config.rpath
 build-aux/config.sub
 build-aux/depcomp
 build-aux/install-sh
 build-aux/mdate-sh
+build-aux/mkinstalldirs
 build-aux/missing
 build-aux/texinfo.tex
 '

import-gnulib.sh

@@ -183,6 +183,30 @@ refresh_output_files() {
 }
 
 
+update_version_file() {
+    local ver
+    outfile="lib/gnulib-version.c"
+    if [ -z "$gnulib_version" ] ; then
+	ver="unknown (locally modified code; no version number available)"
+    else
+	ver="$gnulib_version"
+    fi
+    
+
+    cat > "${outfile}".new <<EOF
+/* This file is automatically generated by $0 and simply records which version of gnulib we used. */
+const char * const gnulib_version = "$ver";
+EOF
+    if test -f "$outfile" ; then
+	if diff "${outfile}".new "${outfile}" > /dev/null ; then
+	    rm "${outfile}".new
+	    return 0
+	fi
+    fi
+    mv "${outfile}".new "${outfile}"
+}
+
+
 main() {
     ## Option parsing
     local gnulibdir=/doesnotexist
@@ -211,7 +235,9 @@ main() {
 
     run_gnulib_tool "${tool}" && 
     hack_gnulib_tool_output "${gnulibdir}" &&
-    refresh_output_files && echo Done.
+    refresh_output_files && 
+    update_version_file  &&
+    echo Done.
 }
 
 main "$@"

lib/Makefile.am

@@ -15,14 +15,14 @@ endif
 
 libfind_a_SOURCES = gnulib-version.c
 EXTRA_DIST = modetype.h wait.h extendbuf.h savedirinfo.h buildcmd.h \
-	gnulib-version.h gnulib-version.sh gnulib-version.c
+	gnulib-version.h gnulib-version.c
 BUILT_SOURCES = gnulib-version.c
 SUFFIXES =
 MOSTLYCLEANFILES = 
 CLEANFILES = 
 DISTCLEANFILES =
 MAINTAINERCLEANFILES =
-IMPORT_GNULIB_CONFIG = $(top_srcdir)/import-gnulib.config
+
 
 INCLUDES = -I../gnulib/lib -I$(top_srcdir)/gnulib/lib 
 LDADD = ../gnulib/lib/libgnulib.a @INTLLIBS@
@@ -42,5 +42,3 @@ libfind_a_DEPENDENCIES = @FINDLIBOBJS@
 # libfind_a_OBJECTS  += @FINDLIBOBJS@
 # libfind_la_OBJECTS += @LTFINDLIBOBJS@
 
-$(srcdir)/gnulib-version.c: $(srcdir)/gnulib-version.sh $(IMPORT_GNULIB_CONFIG)
-	sh $(srcdir)/gnulib-version.sh $(top_srcdir) $(srcdir)  $(IMPORT_GNULIB_CONFIG)

lib/gnulib-version.sh

@@ -1,50 +0,0 @@
-#! /bin/sh
-#
-# gnulib-version.sh -- creates gnulib-version.c (from ../import-gnulib.config)
-# Copyright (C) 2007 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 2, 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, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
-# USA.
-#
-
-topsrcdir="$1"
-srcdir="$2"
-configfile="$3"
-
-outfile="${srcdir}"/gnulib-version.c
-
-source $configfile
-
-if [ -z "$gnulib_version" ] 
-then
-    echo "Error: There should be a gnulib_version setting in $configfile, but there is not." >&2
-    exit 1
-fi
-
-
-cat > "${outfile}".new <<EOF
-/* This file is automatically generated by $0 and simply records which version of gnulib we used. */
-const char * const gnulib_version = "$gnulib_version";
-EOF
-
-if test -f "$outfile" ; then
-    if diff "${outfile}".new "${outfile}" > /dev/null 
-    then
-	# nothing to do
-	rm "${outfile}".new
-	exit 0
-    fi
-fi
-mv "${outfile}".new "${outfile}"

locate/Makefile.am

@@ -39,6 +39,6 @@ updatedb: updatedb.sh
 	chmod +x $@
 
 install-data-hook:
-	$(top_srcdir)/mkinstalldirs $(DESTDIR)$(localstatedir)
+	$(top_srcdir)/build-aux/mkinstalldirs $(DESTDIR)$(localstatedir)
 
 SUBDIRS = testsuite