build: Fix for newer Auto tools.

diff --git a/.gitignore b/.gitignore
index 29bb748..75dd9a0 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -9,4 +9,5 @@ COPYING
 install-sh
 missing
 mkinstalldirs
 install-sh
 missing
 mkinstalldirs

-
+autom4te.cache
+depcomp

diff --git a/acconfig.h b/acconfig.h
deleted file mode 100644 (file)
index 08135f1..0000000
--- a/acconfig.h
+++ /dev/null
@@ -1,58 +0,0 @@
-/* -*-c-*-
- *
- * $Id: acconfig.h,v 1.3 2004/04/08 01:36:19 mdw Exp $
- *
- * Configuration header for Anag
- *
- * (c) 1999 Straylight/Edgeware
- */
-
-/*----- Licensing notice --------------------------------------------------* 
- *
- * This file is part of Anag: a simple wordgame helper.
- *
- * Anag is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- * 
- * Anag is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License
- * along with Anag; if not, write to the Free Software Foundation,
- * Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
- */
-
-#ifndef ACCONFIG_H
-#define ACCONFIG_H
-
-#ifdef __cplusplus
-  extern "C" {
-#endif
-
-/*----- Autoconfiguration data --------------------------------------------*/
-@TOP@
-
-/* Package and version number.  */
-#define PACKAGE "anag"
-#define VERSION "1.0.0"
-
-/* Define this to be your default wordlist location.  */
-#define DICTIONARY "/usr/dict/words"
-
-/* Define this if you have (and want to use) the Perl-Compatible Regular
- * Expression (PCRE) library.  */
-#define HAVE_PCRE
-
-@BOTTOM@
-
-/*----- That's all, folks -------------------------------------------------*/
-
-#ifdef __cplusplus
-  }
-#endif
-
-#endif

diff --git a/configure.in b/configure.in
index f302f3c..4be7667 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -51,13 +51,22 @@ AC_SUBST([TKPROGS])
 
 EXTNODE=""
 AC_CHECK_FUNCS([regcomp])
 
 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],
 
 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([
 AC_SUBST([DICTIONARY])
 
 mdw_DEFINE_PATHS([