build: Fix for newer Auto tools.

[anag] / configure.in

diff --git a/configure.in b/configure.in
index a9dbcc5..4be7667 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -1,6 +1,6 @@
 dnl -*-m4-*-
 dnl
-dnl $Id: configure.in,v 1.4 2003/11/29 23:38:37 mdw Exp $
+dnl $Id: configure.in,v 1.6 2004/04/08 01:36:19 mdw Exp $
 dnl
 dnl Configuration script
 dnl
@@ -25,30 +25,13 @@ dnl You should have received a copy of the GNU General Public License
 dnl along with Anag; if not, write to the Free Software Foundation,
 dnl Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
-dnl ----- Revision history --------------------------------------------------
-dnl
-dnl $Log: configure.in,v $
-dnl Revision 1.4  2003/11/29 23:38:37  mdw
-dnl Debianization.
-dnl
-dnl Revision 1.3  2002/08/11 12:59:00  mdw
-dnl New Tcl/Tk interface; regular expression support.
-dnl
-dnl Revision 1.2  2001/02/06 10:06:25  mdw
-dnl Find a suitable Java compiler.  If there isn't one, don't compile the
-dnl Java bits.
-dnl
-dnl Revision 1.1  2001/02/04 17:14:42  mdw
-dnl Initial checkin
-dnl
-
 AC_INIT(anag.c)
 AM_INIT_AUTOMAKE(anag, 1.1.0)
 AM_CONFIG_HEADER(config.h)
 AC_PROG_CC
 mdw_GCC_FLAGS
 
-AC_CHECK_PROGS([JAVAC], [jikes javac], [none])
+AC_CHECK_PROGS([JAVAC], [javac jikes], [none])
 if test "$JAVAC" = "none"; then
   AC_MSG_WARN([No Java compiler found])
   JARFILES=""
@@ -68,13 +51,22 @@ AC_SUBST([TKPROGS])
 
 EXTNODE=""
 AC_CHECK_FUNCS([regcomp])
-mdw_CHECK_MANYLIBS([pcre_fullinfo], [pcre], [AC_DEFINE([HAVE_PCRE])])
+mdw_CHECK_MANYLIBS([pcre_fullinfo], [pcre],
+  [AC_DEFINE([HAVE_PCRE], [1],
+    [Define if you have libpcre lying around somewhere.])])
 
 AC_ARG_WITH(dictionary,
 [  --with-dictionary=DICT  set default word list to be DICT],
 [DICTIONARY=$withval],
-[DICTIONARY="/usr/dict/words"])
-AC_DEFINE_UNQUOTED([DICTIONARY], ["$DICTIONARY"])
+[AC_CACHE_CHECK([dictionary], [mdw_cv_dictionary],
+   [for mdw_cv_dictionary in \
+        /usr/share/dict/words \
+        /usr/dict/words; do
+      test -r "$i" && break
+    done])
+ DICTIONARY=$mdw_cv_dictionary])
+AC_DEFINE_UNQUOTED([DICTIONARY], ["$DICTIONARY"],
+  [Define this to be your default wordlist location.])
 AC_SUBST([DICTIONARY])
 
 mdw_DEFINE_PATHS([