X-Git-Url: https://git.distorted.org.uk/~mdw/sw-tools/blobdiff_plain/de50c780e3caae4adcad751dde8ea23b9281eb66..165b3d5cd16b4c9995916ea40eea9efe3ae9c93e:/configure.in

diff --git a/configure.in b/configure.in
index b2a8f97..7d6fc67 100644
--- a/configure.in
+++ b/configure.in
@@ -1,12 +1,3 @@
-dnl -*-fundamental-*-
-dnl
-dnl $Id: configure.in,v 1.3 1999/06/18 18:59:39 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,23 +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.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.0pre5)
+AM_INIT_AUTOMAKE(sw-tools, 1.0.5mdw1)
 AM_CONFIG_HEADER(config.h)
 
 dnl --- Work out the architecture name ---
@@ -62,10 +40,6 @@ dnl --- Find a Perl ---
 mdw_PROG_PERL(5.003)
 mdw_CHECK_PERL(5.003)
 
-dnl --- Check for <unistd.h> ---
-
-AC_CHECK_HEADERS(unistd.h)
-
 dnl --- Find an appropriate remote shell program ---
 
 AC_ARG_WITH(rsh,
@@ -74,71 +48,18 @@ AC_ARG_WITH(rsh,
 AC_PATH_PROGS(RSH, $RSH remsh rsh ssh, rsh)
 AC_DEFINE_UNQUOTED(RSH, "$RSH")
 
-dnl --- Find out whether I have `strsignal' or `sys_siglist' ---
-
-AC_CHECK_FUNCS(strsignal _sys_siglist, break)
-
-dnl --- Decide whether to declare `environ' ---
-
-AC_CACHE_CHECK([for declaration of \`environ'], sw_cv_environ,
-[AC_EGREP_CPP(environ, 
-[#include <sys/types.h>
-#if HAVE_UNISTD_H
-#include <unistd.h>
-#endif
-#if STDC_HEADERS
-#include <stdlib.h>
-#include <stddef.h>
-#endif], [sw_cv_environ=yes], [sw_cv_environ=no])])
-if test $sw_cv_environ = yes; then
-  AC_DEFINE(DECL_ENVIRON)
-fi
-
-dnl --- Find a curses library ---
-dnl
-dnl Try to find one which knows how to resize a terminal.
-
-mdw_CHECK_MANYLIBS(newwin, ncurses curses, AC_DEFINE(HAVE_CURSES))
-
-if test $mdw_cv_lib_newwin != no; then
-AC_CHECK_HEADERS([ncurses.h ncurses/ncurses.h curses.h], [break])
-
-if test "$ac_cv_header_ncurses_h" = "no" &&
-   test "$ac_cv_header_ncurses_ncurses_h" = "no" &&
-   test "$ac_cv_header_curses_h" = "no"; then
-     AC_MSG_WARN([couldn't find a \`curses' header.  Assuming \`curses.h'.])
-     AC_DEFINE(HAVE_CURSES_H)
-fi
-
-AC_CHECK_FUNCS(wresize)
-fi
-
-
-dnl --- Other handy libraries ---
-
-mdw_CHECK_MANYLIBS(socketpair, socket)
-
-dnl --- Various standard types ---
+dnl --- Various simple tests ---
 
+AC_CHECK_HEADERS(unistd.h)
+mdw_DECL_ENVIRON
 AC_TYPE_PID_T
 AC_TYPE_SIZE_T
 AC_TYPE_UID_T
-
-AC_CACHE_CHECK(for ssize_t, sw_cv_ssize_t,
-[AC_EGREP_CPP(ssize_t,
-[#include <sys/types.h>
-#if HAVE_UNISTD_H
-#include <unistd.h>
-#endif
-#if STDC_HEADERS
-#include <stdlib.h>
-#include <stddef.h>
-#endif],
-[sw_cv_ssize_t=yes], [sw_cv_ssize_t=no])])
-
-if test $sw_cv_ssize_t = no; then
-  AC_DEFINE(ssize_t, int)
-fi
+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 ---
 
@@ -158,7 +79,10 @@ prefix=$mdw_prefix exec_prefix=$mdw_exec_prefix
 
 dnl --- Output the configuration ---
 
-AC_CONFIG_SUBDIRS(mLib)
-AC_OUTPUT(Makefile src/Makefile sw sw-share)
+AC_OUTPUT(dnl
+  Makefile src/Makefile perl/Makefile dnl
+  perl/SWConfig.pm perl/sw perl/sw-tidy dnl
+  sw sw-share dnl
+)
 
 dnl ----- That's all, folks -------------------------------------------------