X-Git-Url: https://git.distorted.org.uk/~mdw/anag/blobdiff_plain/50959b4c09f71154c6a024e87c37ebcfc21205ae..345f33ea7a273e3196075b07fcc0bc28714793a5:/configure.in

diff --git a/configure.in b/configure.in
index b90e4ee..f302f3c 100644
--- a/configure.in
+++ b/configure.in
@@ -1,6 +1,6 @@
-dnl -*-fundamental-*-
+dnl -*-m4-*-
 dnl
-dnl $Id: configure.in,v 1.3 2002/08/11 12:59:00 mdw Exp $
+dnl $Id: configure.in,v 1.6 2004/04/08 01:36:19 mdw Exp $
 dnl
 dnl Configuration script
 dnl
@@ -25,32 +25,21 @@ 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.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=""
 else
   JARFILES="anag.jar"
 fi
+AC_SUBST([JARFILES])
+
 AC_CHECK_PROGS([WISH], [wish wish8], [none])
 if test "$WISH" = "none"; then
   AC_MSG_WARN([No Tcl/Tk interpreter found])
@@ -58,19 +47,23 @@ if test "$WISH" = "none"; then
 else
   TKPROGS="anag-gui"
 fi
+AC_SUBST([TKPROGS])
+
 EXTNODE=""
 AC_CHECK_FUNCS([regcomp])
-AC_SUBST([JARFILES])
-AC_SUBST([TKPROGS])
+mdw_CHECK_MANYLIBS([pcre_fullinfo], [pcre], [AC_DEFINE([HAVE_PCRE])])
+
 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_SUBST([DICTIONARY])
+
 mdw_DEFINE_PATHS([
   ANAG=mdw_PATH([${bindir}])/mdw_PROG([anag])
 ])
+
 AC_SUBST([ANAG])
 AC_OUTPUT(Makefile anag-gui)