## -*-makefile-*-
##
-## $Id: Makefile.am,v 1.7 2001/02/19 19:19:21 mdw Exp $
+## $Id: Makefile.am,v 1.8 2002/08/11 12:59:00 mdw Exp $
##
## Makefile for Anag
##
##----- Revision history ----------------------------------------------------
##
## $Log: Makefile.am,v $
+## Revision 1.8 2002/08/11 12:59:00 mdw
+## New Tcl/Tk interface; regular expression support.
+##
## Revision 1.7 2001/02/19 19:19:21 mdw
## Minor build system fixes.
##
.java.class:; $(JAVAC) -d . $<
bin_PROGRAMS = anag
-java_DATA = @jarfiles@
+bin_SCRIPTS = @TKPROGS@
+EXTRA_SCRIPTS = anag-gui
+java_DATA = @JARFILES@
-anag_SOURCES = anag.c anag.h wildcard.c anagram.c trackword.c util.c
+anag_SOURCES = \
+ anag.c anag.h wildcard.c anagram.c trackword.c regexp.c util.c
+EXTRA_anag_SOURCES = regexp.c
anag.jar: AnagGUI.class
jar cf anag.jar Anag*.class
zip -qlr $(PACKAGE).zip $(distdir)
rm -rf $(distdir)
-EXTRA_DIST = AnagGUI.java
+EXTRA_DIST = AnagGUI.java anag-gui
CLEANFILES = *.class *.jar
##----- That's all, folks ---------------------------------------------------
dnl -*-fundamental-*-
dnl
-dnl $Id: configure.in,v 1.2 2001/02/06 10:06:25 mdw Exp $
+dnl $Id: configure.in,v 1.3 2002/08/11 12:59:00 mdw Exp $
dnl
dnl Configuration script
dnl
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
AC_INIT(anag.c)
-AM_INIT_AUTOMAKE(anag, 1.0.0)
+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], [jikes javac], [none])
if test "$JAVAC" = "none"; then
AC_MSG_WARN([No Java compiler found])
- jarfiles=""
+ JARFILES=""
+else
+ JARFILES="anag.jar"
+fi
+AC_CHECK_PROGS([WISH], [wish wish8], [none])
+if test "$WISH" = "none"; then
+ AC_MSG_WARN([No Tcl/Tk interpreter found])
+ TKPROGS=""
else
- jarfiles=anag.jar
+ TKPROGS="anag-gui"
fi
-AC_SUBST(jarfiles)
+EXTNODE=""
+AC_CHECK_FUNCS([regcomp])
+AC_SUBST([JARFILES])
+AC_SUBST([TKPROGS])
AC_ARG_WITH(dictionary,
[ --with-dictionary=DICT set default word list to be DICT],
-[AC_DEFINE_UNQUOTED(DICTIONARY, "$withval")],
-[AC_DEFINE(DICTIONARY, "/usr/dict/words")])
-AC_OUTPUT(Makefile)
+[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)
dnl ----- That's all, folks -------------------------------------------------