summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJames Youngman <jay@gnu.org>2015-12-28 10:38:28 +0000
committerJames Youngman <jay@gnu.org>2015-12-28 10:38:28 +0000
commit601cef07bb0645189e838604bdeb19743425b4e7 (patch)
treeed3f52441324b6d3d96d0694c35d381138d4f57e
parentf5934323090bfa4c07b5b6a7f4c9eb3f419868e7 (diff)
downloadfindutils-601cef07bb0645189e838604bdeb19743425b4e7.tar.gz
Apply some improvements suggested by Mike Frysinger.
These improvements were suggested at https://savannah.gnu.org/bugs/?46714. * find/Makefile.am (check_PROGRAMS): Put oldfind in check_PROGRAMS instead of noinst_PROGRAMS, so that we don't build it when it is not needed. * m4/withfts.m4 (FIND_WITH_FTS): Fix whitespace alignment. (FIND_WITH_FTS): The WITH_FTS C preprocessor macro and the accompanying Automake conditional are no longer needed. * THANKS: Add Mike Frysinger.
-rw-r--r--THANKS1
-rw-r--r--find/Makefile.am2
-rw-r--r--m4/withfts.m44
3 files changed, 3 insertions, 4 deletions
diff --git a/THANKS b/THANKS
index a3f83e20..904d72e3 100644
--- a/THANKS
+++ b/THANKS
@@ -34,6 +34,7 @@ Mark Kettenis <kettenis@gnu.org>
Martin Buchholz
Matt Mueller <donut@azstarnet.com>
Michael Haubenwallner <michael.haubenwallner@salomon.at>
+Mike Frysinger <vapier@gentoo.org>
Nelson Beebe
Nigel Stepp <stepp@atistart.net>
Nix <nix@esperi.org.uk>
diff --git a/find/Makefile.am b/find/Makefile.am
index c9207e9f..34317873 100644
--- a/find/Makefile.am
+++ b/find/Makefile.am
@@ -9,7 +9,7 @@ libfindtools_a_SOURCES = finddata.c fstype.c parser.c pred.c exec.c tree.c util.
# one without (called "oldfind"). The oldfind binary is no longer
# installed.
bin_PROGRAMS = find
-noinst_PROGRAMS = oldfind
+check_PROGRAMS = oldfind
find_SOURCES = ftsfind.c
oldfind_SOURCES = oldfind.c
man_MANS = find.1
diff --git a/m4/withfts.m4 b/m4/withfts.m4
index 8fb91e32..71a93af8 100644
--- a/m4/withfts.m4
+++ b/m4/withfts.m4
@@ -6,9 +6,7 @@ AC_DEFUN([FIND_WITH_FTS],
case $with_fts in
yes) ;;
'') with_fts=yes ;;
- no) AC_MSG_ERROR([Using --without-fts is not longer supported]) ;;
+ no) AC_MSG_ERROR([Using --without-fts is not longer supported]) ;;
*) AC_MSG_ERROR([Invalid value for --with-fts: $with_fts])
esac
- AM_CONDITIONAL(WITH_FTS, [[test x"${with_fts-no}" != xno]])
- AC_DEFINE([WITH_FTS], 1, [Define if you want to use fts() to do the filesystem search.])
])