X-Git-Url: https://git.distorted.org.uk/~mdw/sw-tools/blobdiff_plain/c12f3803ae19907eff2f922622f43bf1d6789603..c629200be4128053bb2c1e73f1b337cf099c2411:/configure.in

diff --git a/configure.in b/configure.in
index a4e7d79..ee36d35 100644
--- a/configure.in
+++ b/configure.in
@@ -1,6 +1,6 @@
 dnl -*-fundamental-*-
 dnl
-dnl $Id: configure.in,v 1.5 1999/07/16 12:46:04 mdw Exp $
+dnl $Id: configure.in,v 1.10 1999/11/11 20:24:37 mdw Exp $
 dnl
 dnl Configuration for sw-tools
 dnl
@@ -28,18 +28,24 @@ dnl Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 dnl ----- Revision history --------------------------------------------------
 dnl
 dnl $Log: configure.in,v $
+dnl Revision 1.10  1999/11/11 20:24:37  mdw
+dnl Build separately from mLib.
+dnl
+dnl Revision 1.9  1999/09/24 13:17:53  mdw
+dnl Version bump.
+dnl
+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
@@ -47,7 +53,7 @@ dnl
 dnl --- Boring boilerplate ---
 
 AC_INIT(src/sw.c)
-AM_INIT_AUTOMAKE(sw-tools, 1.0.0)
+AM_INIT_AUTOMAKE(sw-tools, 1.0.3)
 AM_CONFIG_HEADER(config.h)
 
 dnl --- Work out the architecture name ---
@@ -68,10 +74,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,
@@ -80,70 +82,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 ---
 
@@ -163,7 +113,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 -------------------------------------------------