Commit ba9948be authored by sof's avatar sof

[project @ 2001-10-13 20:26:13 by sof]

Added FPTOOLS_FIND_FIND.

On Win32 boxes, rejects the MS 'find' utility and continues
searching for GNU find. On non-Win32 boxes, equal to
AC_PATH_PROG(FindCmd, find)
parent af03f116
dnl $Id: aclocal.m4,v 1.84 2001/10/09 08:31:15 sof Exp $
dnl $Id: aclocal.m4,v 1.85 2001/10/13 20:26:13 sof Exp $
dnl
dnl Extra autoconf macros for the Glasgow fptools
dnl
......@@ -412,6 +412,29 @@ fi
rm -fr conftest*
])
dnl
dnl Getting at the right version of 'find'
dnl (i.e., not the MS util on a Win32 box).
dnl
AC_DEFUN(FPTOOLS_FIND_FIND,
[
AC_PATH_PROG(Find2Cmd, find)
$Find2Cmd --version > conftest.out 2>&1
if grep "FIND: Parameter format" conftest.out >/dev/null 2>&1 ; then
# Encountered MS' find utility, which is not what we're after.
#
# HACK - AC_CHECK_PROG is useful here in that does let you reject
# an (absolute) entry in the path (Find2Cmd). It is not so useful
# in that it doesn't let you (AFAIU) set VARIABLE equal to the
# absolute path eventually found. So, hack around this by inspecting
# what variables hold the abs. path & use them directly.
AC_CHECK_PROG(FindCmd,find,`echo $ac_dir/$ac_word`,find,,$Find2Cmd)
else
FindCmd=$Find2Cmd
AC_SUBST(FindCmd)
fi
])
dnl
dnl FPTOOLS_NOCACHE_CHECK prints a message, then sets the
dnl values of the second argument to the result of running
......
......@@ -542,7 +542,7 @@ dnl ** figure out how to do context diffs
FPTOOLS_PROG_DIFF
dnl ** Find find command (for Win32's benefit)
AC_PATH_PROG(FindCmd, find)
FPTOOLS_FIND_FIND
dnl ** look for a decent parser generator (bison preferred)
dnl (FPTOOLS_PROG_YACCY is AC_PROG_YACC, but with some extra testing
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment