Fix for new automake.

diff --git a/.links b/.links
index 7f03cf3..4bb9069 100644 (file)
--- a/.links
+++ b/.links
@@ -1,8 +1,5 @@
 COPYING
 COPYING.LIB
-install-sh
-missing
-mkinstalldirs
 getdate.y
 getdate.h
 lib-config.in

diff --git a/acconfig.h b/acconfig.h
deleted file mode 100644 (file)
index 5ad9adc..0000000
--- a/acconfig.h
+++ /dev/null
@@ -1,64 +0,0 @@
-/* -*-c-*-
- *
- * $Id: acconfig.h,v 1.4 2004/04/08 01:36:15 mdw Exp $
- *
- * Configuration header for Catacomb
- *
- * (c) 1999 Straylight/Edgeware
- */
-
-/*----- Licensing notice --------------------------------------------------* 
- *
- * This file is part of Catacomb.
- *
- * Catacomb is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Library General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- * 
- * Catacomb 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 Library General Public License for more details.
- * 
- * You should have received a copy of the GNU Library General Public
- * License along with Catacomb; if not, write to the Free
- * Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
- * MA 02111-1307, USA.
- */
-
-#ifndef CATACOMB_ACCONFIG_H
-#define CATACOMB_ACCONFIG_H
-
-#ifdef __cplusplus
-  extern "C" {
-#endif
-
-/*----- Autoconfiguration data --------------------------------------------*/
-@TOP@
-
-/* Package and version number.  */
-#define PACKAGE "catacomb"
-#define VERSION "1.0.0"
-
-/* If it's not provided already, define to be a signed integer type capable
- * of representing any object size.  (If in doubt, make it an `int'.)  */
-#undef ssize_t
-
-/* If not provided already, define to be whatever your system uses for
- * representing time.  (Probably `long'.)  */
-#undef time_t
-
-/* Define if you have working `setitimer' and `sigsetjmp' functions.  This
- * sill enable the free counter noise generator.  */
-#define USE_FREEWHEEL
-
-@BOTTOM@
-
-/*----- That's all, folks -------------------------------------------------*/
-
-#ifdef __cplusplus
-  }
-#endif
-
-#endif

diff --git a/configure.in b/configure.in
index f7761b7..f35a8df 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -1,6 +1,6 @@
 dnl -*-m4-*-
 dnl
-dnl $Id: configure.in,v 1.28 2004/04/08 01:36:15 mdw Exp $
+dnl $Id$
 dnl
 dnl Autoconfiguration for Catacomb
 dnl
@@ -75,7 +75,8 @@ sigsetjmp(j, 1);],
 [catacomb_cv_freewheel=yes],
 [catacomb_cv_freewheel=no])])
 if test "$catacomb_cv_freewheel" = "yes"; then
-  AC_DEFINE([USE_FREEWHEEL])
+  AC_DEFINE([USE_FREEWHEEL], [1],
+            [Define if you want to use the freewheel noise generator.])
 fi
 
 dnl --- Support for the passphrase pixie ---

diff --git a/setup b/setup
index 2fe31b8..ff17e27 100755 (executable)
--- a/setup
+++ b/setup
@@ -4,9 +4,8 @@ set -e
 mklinks
 libtoolize
 mkaclocal
-autoheader
 m4 Makefile.m4 >Makefile.am
 (cd tests && m4 Makefile.m4 >Makefile.am)
 autoconf
-automake
+automake -a
 mkdir -p build