~mdw
/
anag
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
f8ee1b9
)
New Tcl/Tk interface; regular expression support.
1.1.0
author
mdw
<mdw>
Sun, 11 Aug 2002 12:59:00 +0000
(12:59 +0000)
committer
mdw
<mdw>
Sun, 11 Aug 2002 12:59:00 +0000
(12:59 +0000)
Makefile.am
patch
|
blob
|
blame
|
history
configure.in
patch
|
blob
|
blame
|
history
diff --git
a/Makefile.am
b/Makefile.am
index
5e02cb6
..
d9566bd
100644
(file)
--- a/
Makefile.am
+++ b/
Makefile.am
@@
-1,6
+1,6
@@
## -*-makefile-*-
##
## -*-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
##
##
## Makefile for Anag
##
@@
-28,6
+28,9
@@
##----- Revision history ----------------------------------------------------
##
## $Log: Makefile.am,v $
##----- 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.
##
## Revision 1.7 2001/02/19 19:19:21 mdw
## Minor build system fixes.
##
@@
-60,9
+63,13
@@
SUFFIXES = .java .class
.java.class:; $(JAVAC) -d . $<
bin_PROGRAMS = anag
.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
anag.jar: AnagGUI.class
jar cf anag.jar Anag*.class
@@
-71,7
+78,7
@@
doszip: distdir
zip -qlr $(PACKAGE).zip $(distdir)
rm -rf $(distdir)
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 ---------------------------------------------------
CLEANFILES = *.class *.jar
##----- That's all, folks ---------------------------------------------------
diff --git
a/configure.in
b/configure.in
index
d60c472
..
b90e4ee
100644
(file)
--- a/
configure.in
+++ b/
configure.in
@@
-1,6
+1,6
@@
dnl -*-fundamental-*-
dnl
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
dnl Configuration script
dnl
@@
-28,6
+28,9
@@
dnl Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
dnl ----- Revision history --------------------------------------------------
dnl
dnl $Log: configure.in,v $
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 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.
@@
-37,22
+40,38
@@
dnl Initial checkin
dnl
AC_INIT(anag.c)
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
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])
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
else
- jarfiles=anag.jar
+ TKPROGS="anag-gui"
fi
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_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 -------------------------------------------------
dnl ----- That's all, folks -------------------------------------------------