Merge some changes from 1.0.4. Very odd.

[sw-tools] / configure.in

diff --git a/configure.in b/configure.in
index 5934f6e969bbf218c010f44df7b788b4b90a6feb..7d6fc6753614dbaf722576b158fad4a7d3cdf0b8 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -1,12 +1,3 @@
-dnl -*-fundamental-*-
-dnl
-dnl $Id: configure.in,v 1.7 1999/07/30 18:45:36 mdw Exp $
-dnl
-dnl Configuration for sw-tools
-dnl
-dnl (c) 1999 EBI
-dnl
-
 dnl ----- Licensing notice --------------------------------------------------
 dnl
 dnl This file is part of sw-tools.
@@ -25,35 +16,10 @@ dnl You should have received a copy of the GNU General Public License
 dnl along with sw-tools; 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.7  1999/07/30 18:45:36  mdw
-dnl Configure the Perl bits.
-dnl
-dnl Revision 1.6  1999/07/28 09:31:49  mdw
-dnl Small amounts of tidying.
-dnl
-dnl Revision 1.5  1999/07/16 12:46:04  mdw
-dnl First proper release version.
-dnl
-dnl Revision 1.4  1999/06/24 15:53:11  mdw
-dnl Bump the version number again.
-dnl
-dnl Revision 1.3  1999/06/18 18:59:39  mdw
-dnl Preliminary work for Perl scripts.
-dnl
-dnl Revision 1.2  1999/06/04 13:56:36  mdw
-dnl Bump version.
-dnl
-dnl Revision 1.1.1.1  1999/06/02 16:53:33  mdw
-dnl Initial import.
-dnl
-
 dnl --- Boring boilerplate ---
 
 AC_INIT(src/sw.c)
-AM_INIT_AUTOMAKE(sw-tools, 1.0.0)
+AM_INIT_AUTOMAKE(sw-tools, 1.0.5mdw1)
 AM_CONFIG_HEADER(config.h)
 
 dnl --- Work out the architecture name ---
@@ -92,6 +58,7 @@ AC_TYPE_UID_T
 mdw_TYPE_SSIZE_T
 AC_CHECK_FUNCS(strsignal _sys_siglist, break)
 mdw_CURSES
+mdw_MLIB
 mdw_CHECK_MANYLIBS(socketpair, socket)
 
 dnl --- Write in some useful paths ---
@@ -112,7 +79,6 @@ prefix=$mdw_prefix exec_prefix=$mdw_exec_prefix
 
 dnl --- Output the configuration ---
 
-AC_CONFIG_SUBDIRS(mLib)
 AC_OUTPUT(dnl
   Makefile src/Makefile perl/Makefile dnl
   perl/SWConfig.pm perl/sw perl/sw-tidy dnl