bug-inetutils
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: configure.ac rewrite..


From: Alfred M. Szmidt
Subject: Re: configure.ac rewrite..
Date: 21 Apr 2002 20:18:11 +0200
User-agent: Gnus/5.09 (Gnus v5.9.0) Emacs/21.2.50

Next time attach this thing that people call patches..

Index: Makefile.am
===================================================================
RCS file: /cvsroot/inetutils/inetutils/Makefile.am,v
retrieving revision 1.19
diff -u -p -r1.19 Makefile.am
--- Makefile.am 11 Feb 2002 04:17:00 -0000      1.19
+++ Makefile.am 21 Apr 2002 18:15:33 -0000
@@ -1,4 +1,4 @@
-AUTOMAKE_OPTIONS = 1.5
+AUTOMAKE_OPTIONS = 1.6
 
 EXTRA_DIST = README-alpha paths ChangeLog.0
 
Index: acinclude.m4
===================================================================
RCS file: /cvsroot/inetutils/inetutils/acinclude.m4,v
retrieving revision 1.5
diff -u -p -r1.5 acinclude.m4
--- acinclude.m4        8 Apr 2002 13:59:51 -0000       1.5
+++ acinclude.m4        21 Apr 2002 18:15:33 -0000
@@ -1,6 +1,6 @@
 dnl Autoconf macros used by inetutils
 dnl
-dnl Copyright (C) 1996, 1997, 1998, 2002 Free Software Foundation, Inc.
+dnl Copyright (C) 1996, 1997, 1998, 2002 Free Software Foundation, Inc.
 dnl
 dnl Mostly written by Miles Bader <address@hidden>
 dnl
@@ -22,10 +22,6 @@ dnl along with this program; if not, wri
 dnl Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 dnl
 
-# For case-conversion with sed
-IU_UCASE=ABCDEFGHIJKLMNOPQRSTUVWXYZ
-iu_lcase=abcdefghijklmnopqrstuvwxyz
-
 dnl IU_FLUSHLEFT -- remove all whitespace at the beginning of lines
 dnl This is useful for c-code which may include cpp statements
 dnl
@@ -44,7 +40,8 @@ dnl
 AC_DEFUN([IU_RESULT_ACTIONS], [
 [if test "$$1" = yes; then
   ]ifelse([$3], ,
-          [AC_DEFINE(HAVE_]translit($2, [a-z ./<>], [A-Z___])[)],
+          [AC_DEFINE(HAVE_]translit($2, [a-z ./<>], [A-Z___])[, 1,
+                    [FIXME])],
           [$3])[
 else
   ]ifelse([$4], , [:], [$4])[
@@ -80,53 +77,6 @@ changequote([,])dnl
   IU_RESULT_ACTIONS(IU_CVAR, [$1], [$4], [$5]) dnl
   undefine([IU_CVAR]) undefine([IU_TAG])])dnl
 
-dnl IU_CHECK_DECL -- See if a function/variable is declared
-dnl   $1 - NAME  -- name of c symbol to check
-dnl   $2 - INCLS -- C program text to inculde necessary files for testing
-dnl   $3 - TRUE  -- what to do if NAME is declared; defaults to 
-dnl                `AC_DEFINE(HAVE_NAME_DECL)'
-dnl   $4 - FALSE -- what to do if NAME isn't declared; defaults to `:'
-dnl
-AC_DEFUN([IU_CHECK_DECL], [
-  define([IU_CVAR], [inetutils_cv_decl_]translit($1, [A-Z], [a-z]))dnl
-  AC_CACHE_CHECK([whether $1 is declared], IU_CVAR,
-    AC_TRY_COMPILE(IU_FLUSHLEFT([$2]), [char *iu_x = (char *)$1],
-      IU_CVAR[=yes], IU_CVAR[=no]))
-  IU_RESULT_ACTIONS(IU_CVAR, [$1_DECL], [$3], [$4])dnl
-  undefine([IU_CVAR])])
-
-dnl IU_CHECK_TYPE -- See if a typedef is defined
-dnl   $1 - TYPE  -- name of c type to check
-dnl   $2 - INCLS -- C program text to inculde necessary files for testing
-dnl   $3 - TRUE  -- what to do if TYPE is defined; defaults to 
-dnl                `AC_DEFINE(HAVE_TYPE)'
-dnl   $4 - FALSE -- what to do if TYPE isn't defined; defaults to `:'
-dnl
-AC_DEFUN([IU_CHECK_TYPE], [
-  define([IU_CVAR], [inetutils_cv_type_]translit($1, [A-Z ], [a-z_]))dnl
-  AC_CACHE_CHECK([whether $1 is defined], IU_CVAR,
-    AC_TRY_COMPILE(IU_FLUSHLEFT([$2]), [$1 iu_x;],
-      IU_CVAR[=yes], IU_CVAR[=no]))
-  IU_RESULT_ACTIONS(IU_CVAR, [$1], [$3], [$4])dnl
-  undefine([IU_CVAR])])
-
-dnl IU_CHECK_STRUCT_FIELD -- See if a structure has a particular field
-dnl   $1 - NAME  -- name of structure
-dnl   $2 - FIELD -- name of field to test
-dnl   $3 - INCLS -- C program text to inculde necessary files for testing
-dnl   $4 - TRUE  -- what to do if struct NAME has FIELD; defaults to 
-dnl                `AC_DEFINE(HAVE_NAME_FIELD)'
-dnl   $5 - FALSE -- what to do if not; defaults to `:'
-dnl
-AC_DEFUN([IU_CHECK_STRUCT_FIELD], [
-  define([IU_CVAR], [inetutils_cv_struct_]translit($1_$2, [A-Z], [a-z]))dnl
-  AC_CACHE_CHECK([whether struct $1 has $2 field], IU_CVAR,
-    AC_TRY_COMPILE(IU_FLUSHLEFT([$3]),
-      [struct $1 iu_x; int iu_y = sizeof iu_x.$2;],
-      IU_CVAR[=yes], IU_CVAR[=no]))
-  IU_RESULT_ACTIONS(IU_CVAR, [$1_$2], [$4], [$5])dnl
-  undefine([IU_CVAR])])dnl
-
 dnl 
 dnl Following are some more specific tests
 dnl
@@ -140,6 +90,7 @@ dnl This can't just be a compile-check, 
 dnl feature isn't actually supported.
 dnl
 AC_DEFUN([IU_CHECK_WEAK_REFS], [
+  AH_TEMPLATE(HAVE_WEAK_REFS, 1, [Define if you have weak references])
   AC_CACHE_CHECK(whether gcc weak references work,
                 inetutils_cv_attr_weak_refs,
     AC_TRY_LINK([],
@@ -148,7 +99,9 @@ AC_DEFUN([IU_CHECK_WEAK_REFS], [
       [inetutils_cv_attr_weak_refs=yes],
       [inetutils_cv_attr_weak_refs=no]))
   if test "$inetutils_cv_weak_refs" = yes; then
-    AC_DEFINE(HAVE_WEAK_REFS) AC_DEFINE(HAVE_ATTR_WEAK_REFS)
+    AC_DEFINE(HAVE_WEAK_REFS)
+    AC_DEFINE(HAVE_ATTR_WEAK_REFS, 1,
+              [Define if you have weak "attribute" references])
   else
     AC_CACHE_CHECK(whether pragma weak references work,
                   inetutils_cv_pragma_weak_refs,
@@ -159,7 +112,9 @@ AC_DEFUN([IU_CHECK_WEAK_REFS], [
        [inetutils_cv_pragma_weak_refs=yes],
        [inetutils_cv_pragma_weak_refs=no]))
     if test "$inetutils_cv_pragma_weak_refs" = yes; then
-      AC_DEFINE(HAVE_WEAK_REFS) AC_DEFINE(HAVE_PRAGMA_WEAK_REFS)
+      AC_DEFINE(HAVE_WEAK_REFS)
+      AC_DEFINE(HAVE_PRAGMA_WEAK_REFS, 1,
+                [Define if you have weak "pragma" references])
     else
       AC_CACHE_CHECK(whether asm weak references work,
                     inetutils_cv_asm_weak_refs,
@@ -170,7 +125,9 @@ AC_DEFUN([IU_CHECK_WEAK_REFS], [
          [inetutils_cv_asm_weak_refs=yes],
          [inetutils_cv_asm_weak_refs=no]))
       if test "$inetutils_cv_asm_weak_refs" = yes; then
-       AC_DEFINE(HAVE_WEAK_REFS) AC_DEFINE(HAVE_ASM_WEAK_REFS)
+       AC_DEFINE(HAVE_WEAK_REFS)
+       AC_DEFINE(HAVE_ASM_WEAK_REFS, 1,
+                 [Define if you have weak "assembler" references])
       fi
     fi
   fi])dnl
@@ -299,18 +256,16 @@ dnl defines it to be that system define,
 dnl will be case if overridden by make).
 dnl
 AC_DEFUN([IU_CONFIG_PATHS], [
-  dnl
   dnl We need to know if we're cross compiling.
-  dnl
   AC_REQUIRE([AC_PROG_CC])
-  dnl
-  AC_CHECK_HEADER(paths.h, AC_DEFINE(HAVE_PATHS_H) iu_paths_h="<paths.h>")
-  dnl 
+
+  AC_CHECK_HEADER(paths.h, AC_DEFINE(HAVE_PATHS_H, 1,
+        [Define if you have the <paths.h> header file]) iu_paths_h="<paths.h>")
+
   dnl A slightly bogus use of AC_ARG_WITH; we never actually use
   dnl $with_PATHVAR, we just want to get this entry put into the help list.
   dnl We actually look for `with_' variables corresponding to each path
   dnl configured.
-  dnl 
   AC_ARG_WITH(PATHVAR,
 [  --with-PATHVAR=PATH     Set the value of PATHVAR to PATH
                           PATHVAR is the name of a \`PATH_FOO' variable,
@@ -477,7 +432,7 @@ HAVE_$iu_sym
       iu_path="`echo $iu_var | sed -e 's/^inetutils_cv_//' -e 
y/${iu_lcase}/${IU_UCASE}/`"
       iu_pathdef="`echo $iu_path | sed 's/^PATH_/PATHDEF_/'`"
       echo $iu_pathdef = -D$iu_path='\"'"$iu_val"'\"'
-      AC_DEFINE_UNQUOTED($iu_path,"$iu_val")
+      AC_DEFINE_UNQUOTED($iu_path, "$iu_val")
     fi
   done >$[$2]
   AC_SUBST_FILE([$2])
@@ -497,28 +452,28 @@ EOF
   done >$[$3]
   AC_SUBST_FILE([$3])])
 
-AC_DEFUN([IU_ENABLE_FOO], [
-AC_ARG_ENABLE($1, [  --disable-$1       don't compile $1], ,
-[enable_]$1[=$enable_]$2
-)
-
+AC_DEFUN([IU_ENABLE_FOO],
+ [AC_ARG_ENABLE($1, [  --disable-$1               don't compile $1], ,
+                [enable_]$1[=$enable_]$2)
 [if test "$enable_$1" = yes; then 
-BUILD_]translit($1, [a-z], [A-Z])[=$1]
-[else BUILD_]translit($1, [a-z], [A-Z])=''; fi
-])dnl
+   $1_BUILD=$1
+else
+   $1_BUILD=''
+fi;]
+  AC_SUBST([$1_BUILD])
+])
 
-AC_DEFUN([IU_ENABLE_CLIENT], [
-IU_ENABLE_FOO($1, clients)])
+AC_DEFUN([IU_ENABLE_CLIENT], [IU_ENABLE_FOO($1, clients)])
+AC_DEFUN([IU_ENABLE_SERVER], [IU_ENABLE_FOO($1, servers)])
 
-AC_DEFUN([IU_ENABLE_SERVER], [
-IU_ENABLE_FOO($1, servers)])
+#serial 12
 
 dnl Initially derived from code in GNU grep.
 dnl Mostly written by Jim Meyering.
 
 dnl Usage: jm_INCLUDED_REGEX([lib/regex.c])
 dnl
-AC_DEFUN(IU_INCLUDED_REGEX,
+AC_DEFUN([jm_INCLUDED_REGEX],
   [
     dnl Even packages that don't use regex.c can use this macro.
     dnl Of course, for them it doesn't do anything.
@@ -534,19 +489,16 @@ AC_DEFUN(IU_INCLUDED_REGEX,
     AC_CACHE_CHECK([for working re_compile_pattern],
                   jm_cv_func_working_re_compile_pattern,
       AC_TRY_RUN(
-       changequote(<<, >>)dnl
-       <<
-#include <stdio.h>
+[#include <stdio.h>
 #include <regex.h>
          int
          main ()
          {
            static struct re_pattern_buffer regex;
            const char *s;
+           struct re_registers regs;
            re_set_syntax (RE_SYNTAX_POSIX_EGREP);
-           /* Add this third left square bracket, [, to balance the
-              three right ones below.  Otherwise autoconf-2.14 chokes.  */
-           s = re_compile_pattern ("a[[:]:]]b\n", 9, &regex);
+           [s = re_compile_pattern ("a[[:@:>@:]]b\n", 9, &regex);]
            /* This should fail with _Invalid character class name_ error.  */
            if (!s)
              exit (1);
@@ -554,11 +506,22 @@ AC_DEFUN(IU_INCLUDED_REGEX,
            /* This should succeed, but doesn't for e.g. glibc-2.1.3.  */
            s = re_compile_pattern ("{1", 2, &regex);
 
-          exit (s ? 1 : 0);
-         }
-       >>,
-       changequote([, ])dnl
+           if (s)
+             exit (1);
+
+           /* The following example is derived from a problem report
+               against gawk from Jorge Stolfi <address@hidden>.  */
+           s = re_compile_pattern ("[[anĂ¹]]*n", 7, &regex);
+           if (s)
+             exit (1);
 
+           /* This should match, but doesn't for e.g. glibc-2.2.1.  */
+           if (re_match (&regex, "an", 2, 0, &regs) != 2)
+             exit (1);
+
+           exit (0);
+         }
+       ],
               jm_cv_func_working_re_compile_pattern=yes,
               jm_cv_func_working_re_compile_pattern=no,
               dnl When crosscompiling, assume it's broken.
@@ -568,10 +531,9 @@ AC_DEFUN(IU_INCLUDED_REGEX,
     fi
 
     test -n "$1" || AC_MSG_ERROR([missing argument])
-    syscmd([test -f $1])
-    ifelse(sysval, 0,
+    m4_syscmd([test -f $1])
+    ifelse(m4_sysval, 0,
       [
-
        AC_ARG_WITH(included-regex,
        [  --without-included-regex don't compile regex; this is the default on
                           systems with version 2 of the GNU C library
@@ -579,8 +541,7 @@ AC_DEFUN(IU_INCLUDED_REGEX,
                    jm_with_regex=$withval,
                    jm_with_regex=$ac_use_included_regex)
        if test "$jm_with_regex" = yes; then
-         AC_SUBST(LIBOBJS)
-         LIBOBJS="$LIBOBJS regex.$ac_objext"
+         AC_LIBOBJ(regex)
        fi
       ],
     )
@@ -661,4 +622,4 @@ AC_DEFUN(IU_CHECK_KRB5,
  fi
  AC_MSG_CHECKING(krb5 implementation)
  AC_MSG_RESULT(${cached}$KRB5_IMPL)
-])
\ No newline at end of file
+])
Index: configure.ac
===================================================================
RCS file: /cvsroot/inetutils/inetutils/configure.ac,v
retrieving revision 1.4
diff -u -p -r1.4 configure.ac
--- configure.ac        8 Apr 2002 14:00:26 -0000       1.4
+++ configure.ac        21 Apr 2002 18:15:33 -0000
@@ -1,6 +1,6 @@
 # Configuration for inetutils
 #
-# Copyright (C) 1995, 1996, 1997, 1998, 2000, 2001 Free Software Foundation, 
Inc.
+# Copyright (C) 1995, 1996, 1997, 1998, 2000, 2001, 2002 Free Software 
Foundation, Inc.
 #
 # Written by Miles Bader <address@hidden>
 #
@@ -19,24 +19,15 @@
 # Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 #
 
-AC_INIT
-AC_CONFIG_SRCDIR([inetd/inetd.c])
-
-# Versions of autoconf before 2.12 had bugs in autoheader that screwed up
-# the production of headers/config.h.in.
 AC_PREREQ(2.52)
 
-AC_CANONICAL_SYSTEM
-AM_INIT_AUTOMAKE([inetutils], [1.3.2e], nodef)
+AC_INIT([GNU inetutils], [1.3.2e], address@hidden)
+VERSION=1.3.2e
+AC_SUBST(VERSION) # FIXME: Why is this used over PACKAGE_VERSION?
 
-# Generate <config.h>; note that we use a `header' subdirectory, which
-# contains all include files distributed with inetutils, and an `include'
-# directory, which holds those actually needed for compilation.
-#
-# If config.h.in needs to be regenerated (because of changes in configure.in
-# or headers/acconfig.h, use the command `autoheader -l headers'.
-#
-AM_CONFIG_HEADER(config.h)
+AC_CONFIG_SRCDIR([inetd/inetd.c])
+AM_CONFIG_HEADER([config.h:config.hin])
+AC_CANONICAL_SYSTEM # FIXME: Why not just _HOST?
 
 # config.h turns this on, so make sure it's on for our tests too
 #CPPFLAGS=-D_BSD_SOURCE
@@ -51,15 +42,31 @@ INCLUDES="crypt.h arpa/telnet.h arpa/ftp
 LINK_SRCS=''
 LINK_DSTS=''
 
-# By default we compile both servers and clients, but see what the user wants
+dnl For now, we always use libexecdir; later we may want to vary where the
+dnl daemons go.
+inetdaemondir='$(libexecdir)'
+AC_SUBST(inetdaemondir)
+
 AC_ARG_ENABLE(servers, [  --disable-servers       don't compile servers],
              , enable_servers=yes)
 AC_ARG_ENABLE(clients, [  --disable-clients       don't compile clients],
              , enable_clients=yes)
-# Check if they want support for internal ls.
 AC_ARG_ENABLE(libls,   [  --disable-libls         disable support for libls ],
               , enable_libls=yes)
+AC_ARG_ENABLE(encryption, [  --enable-encryption     enable encryption],
+             , enable_encryption=no)
+AC_ARG_ENABLE(authentication,
+              [  --enable-authentication enable connection authentication],
+             , enable_authentication=no)
 
+AC_ARG_WITH(krb4, [  --with-krb4[[=PATH]]      Compile with Kerberos IV],
+            [KERBEROS_VERSION=4
+             KERBEROS_DIR=$withval])
+AC_ARG_WITH(krb5, [  --with-krb5[[=PATH]]      Compile with Kerberos V],
+            [KERBEROS_VERSION=5
+             KERBEROS_DIR=$withval])
+AC_ARG_WITH(wrap, [  --with-wrap    add tcp wrapper support])
+AC_ARG_WITH(pam,  [  --with-pam    add support for PAM])
 
 IU_ENABLE_SERVER(ftpd)
 IU_ENABLE_SERVER(inetd)
@@ -84,336 +91,112 @@ IU_ENABLE_CLIENT(tftp)
 IU_ENABLE_CLIENT(whois)
 IU_ENABLE_CLIENT(ifconfig)
 
-# Automake will generate lines in each Makefile.in for each variable that is
-# specified with AC_SUBST here.  Originally, I tried putting AC_SUBST in
-# IU_ENABLE_FOO, but then I discovered that doing so causes automake to not
-# recognize the variables.  I later realized that with the way I wrote the
-# each Makefile.am, automake doesn't need to recognize the variables, but it's
-# not worth the trouble to change it back.  --devnull
-AC_SUBST(BUILD_FTPD)
-AC_SUBST(BUILD_INETD)
-AC_SUBST(BUILD_REXECD)
-AC_SUBST(BUILD_RLOGIND)
-AC_SUBST(BUILD_RSHD)
-AC_SUBST(BUILD_SYSLOGD)
-AC_SUBST(BUILD_TALKD)
-AC_SUBST(BUILD_TELNETD)
-AC_SUBST(BUILD_TFTPD)
-AC_SUBST(BUILD_UUCPD)
-
-AC_SUBST(BUILD_FTP)
-AC_SUBST(BUILD_PING)
-AC_SUBST(BUILD_RCP)
-AC_SUBST(BUILD_RLOGIN)
-AC_SUBST(BUILD_RSH)
-AC_SUBST(BUILD_LOGGER)
-AC_SUBST(BUILD_TALK)
-AC_SUBST(BUILD_TELNET)
-AC_SUBST(BUILD_TFTP)
-AC_SUBST(BUILD_WHOIS)
-AC_SUBST(BUILD_IFCONFIG)
-
-
-# Encryption and authentication is turned off by default
-AC_ARG_ENABLE(encryption, [  --enable-encryption     enable encryption],
-             , enable_encryption=no)
-AC_ARG_ENABLE(authentication,
-             [  --enable-authentication enable connection authentication],
-             , enable_authentication=no)
-
-AC_ARG_WITH(krb4,
-[  --with-krb4[[=PATH]]      Compile with Kerberos IV],
-            [KERBEROS_VERSION=4
-             KERBEROS_DIR=$withval])
-AC_ARG_WITH(krb5,
-[  --with-krb5[[=PATH]]      Compile with Kerberos V],
-            [KERBEROS_VERSION=5
-             KERBEROS_DIR=$withval])
-
-AC_PROG_MAKE_SET
+AM_INIT_AUTOMAKE
 
-AC_PROG_CC
-AC_PROG_CPP
+### Checks for programs.
 AC_AIX
-AC_MINIX
+AC_CHECK_TOOL(AR, ar)
 AC_ISC_POSIX
-
+AC_MINIX
+AC_PATH_PROG(RM, rm, rm)
+AC_PROG_CC
+AC_PROG_CPP
 AC_PROG_INSTALL
+AC_PROG_MAKE_SET
+AC_PROG_RANLIB
 AC_PROG_YACC
-AC_CHECK_TOOL(AR, ar)
-AC_CHECK_TOOL(RANLIB, ranlib, :)
-AC_PATH_PROG(RM, rm, rm)
-
-# the code is ANSI C
-AM_C_PROTOTYPES
-AC_HEADER_STDC
-AC_C_CONST([])
-AC_C_CONST
-
-
-AC_CHECK_HEADERS(arpa/nameser.h des.h errno.h fcntl.h features.h glob.h \
-                 krb.h memory.h malloc.h netinet/in_systm.h netinet/ip.h \
-                 netinet/ip_icmp.h netinet/ip_var.h \
-                 security/pam_appl.h \
-                 shadow.h stdarg.h stdlib.h string.h stropts.h sys/tty.h \
-                 sys/utsname.h sys/ptyvar.h sys/msgbuf.h sys/filio.h \
-                 sys/ioctl_compat.h sys/cdefs.h sys/stream.h sys/mkdev.h \
-                sys/sockio.h sys/sysmacros.h sys/param.h sys/file.h \
-                sys/proc.h sys/select.h sys/time.h sys/wait.h sys/resource.h \
-                stropts.h tcpd.h termio.h termios.h utmp.h utmpx.h unistd.h \
-                 vis.h)
-AC_CHECK_HEADER(poll.h,
-                [],
-                [INCLUDES="$INCLUDES poll.h"]) 
-AC_HEADER_TIME
-
-AC_CHECK_LIB(nsl, inet_ntoa)
-AC_CHECK_LIB(socket, getpeername)
-AC_CHECK_LIB(resolv, gethostname)
-AC_CHECK_LIB(bsd, revoke)
-
-AC_CHECK_FUNCS(bcopy bcmp bzero cfsetspeed cgetent dirfd fchdir flock \
-               fpathconf ftruncate \
-              getcwd getmsg getspnam initgroups initsetproctitle killpg \
-               mkstemp ptsname \
-               setegid seteuid setpgid \
-               setsid setregid setreuid setresgid setresuid setutent_r \
-               sigaction sigvec strchr setproctitle tcgetattr tzset utimes \
-               utime uname \
-               updwtmp updwtmpx vhangup wait3 wait4)
-
-# Functions that we will define (in libinetutils) if necessary.
-AC_REPLACE_FUNCS(getpass getusershell herror memcmp memcpy memmove memset \
-                setenv strdup strcasecmp strsignal waitpid poll)
-IU_INCLUDED_REGEX(libinetutils/regex.c)
-AC_CHECK_FUNC(_obstack_free, ,
-  INCLUDES="$INCLUDES obstack.h"
-  LIBOBJS="$LIBOBJS obstack.o")
-
-
-# Use (posix) `setpgid' if it's around, otherwise assume a BSD setpgrp
-AC_CHECK_FUNC(setpgid, , AC_DEFINE(setpgid, setpgrp))
-
-# Some systems don't declare common functions (especially if they return int),
-# at least in the expected header file.  Check.
-IU_CHECK_DECL(fclose, [#include <stdio.h>])
-IU_CHECK_DECL(pclose, [#include <stdio.h>])
-IU_CHECK_DECL(getcwd, [#include <unistd.h>])
-IU_CHECK_DECL(getlogin, [#include <unistd.h>])
-IU_CHECK_DECL(getpass, [#include <unistd.h>])
-IU_CHECK_DECL(getusershell, [#include <unistd.h>])
-IU_CHECK_DECL(ttyname, [#include <unistd.h>])
-IU_CHECK_DECL(strerror, [#include <string.h>])
-IU_CHECK_DECL(strchr, [#include <string.h>])
-IU_CHECK_DECL(getgrnam, [#include <grp.h>])
-IU_CHECK_DECL(initgroups, [#include <grp.h>])
-
-IU_CHECK_DECL(htons,
-  [ #ifdef HAVE_SYS_TYPES_H
-    # include <sys/types.h>
-    #endif
-    #ifdef HAVE_SYS_PARAM_H
-    # include <sys/param.h>
-    #endif
-    #include <netinet/in.h> ])
-
-if test "$ac_cv_func_setenv" = no; then
-  # Our home-grown version of setenv needs to use ENVIRON
-  IU_CHECK_DECL(environ,
-    [ #ifdef HAVE_UNISTD_H
-      # include <unistd.h>
-      #endif
-      #ifdef HAVE_STDLIB_H
-      # include <stdlib.h>
-      #endif ])
-fi
-
-# EWOULDBLOCK is more or less the BSD version of posix EAGAIN.
-IU_CHECK_MACRO(EWOULDBLOCK, [#include <errno.h>], ,
-  :, AC_DEFINE(EWOULDBLOCK, EAGAIN))
-IU_CHECK_DECL(errno, [#include <errno.h>])
 
-# __P is the standard name for the ansi-or-not-ansi arg-decl macro.
-# We define our own version in <config.h> if the system doesn't supply one.
+dnl __P is the standard name for the ansi-or-not-ansi arg-decl macro.
+dnl We define our own version in <config.h> if the system doesn't supply one.
+dnl NOTE: This check has to be done pretty early because we use __P in 
<config.h>
 IU_CHECK_MACRO(__P,
   [ #ifdef HAVE_SYS_CDEFS_H
     #include <sys/cdefs.h>
     #endif ])
 
-# If revoke hasn't been defined yet, just define a dummy version
-AC_REPLACE_FUNCS(revoke)
-
-
-AC_HEADER_DIRENT
-AC_FUNC_CLOSEDIR_VOID
-AC_FUNC_ALLOCA
-AC_FUNC_SETVBUF_REVERSED
-AC_FUNC_FORK([])
-AC_FUNC_STRCOLL
-
-# See whether <syslog.h> will declare special internal stuff if we define
-# SYSLOG_NAMES before including it.  We check for various syslog internal 
macros,
-# the typedef `CODE', and the variable `prioritynames'.
-define([iu_syslog_includes],
-  [[ #ifdef HAVE_STDLIB_H
-     #include <stdlib.h>
-     #endif
-     #define SYSLOG_NAMES
-     #include <syslog.h> ]])
-IU_CHECK_MACRO(syslog internal macros,
-  iu_syslog_includes,
-  [LOG_MAKEPRI LOG_PRI LOG_FAC],
-  IU_CHECK_TYPE(CODE,
-    iu_syslog_includes,
-    IU_CHECK_DECL(prioritynames,
-      iu_syslog_includes,
-      AC_DEFINE(HAVE_SYSLOG_INTERNAL),
-      INCLUDES="$INCLUDES syslog-int.h"),
-    INCLUDES="$INCLUDES syslog-int.h"),
-  INCLUDES="$INCLUDES syslog-int.h")
-undefine([iu_syslog_includes])
+AH_BOTTOM(
+[#ifdef HAVE___P
+/* The system defines __P; we tested for it in <sys/cdefs.h>, so include that
+   if we can.  */
+# ifdef HAVE_SYS_CDEFS_H
+#  include <sys/cdefs.h>
+# endif
+#else /* !HAVE___P */
+/* If the system includes don't seem to define __P, do it here instead.  */
+# if defined (__GNUC__) || (defined (__STDC__) && __STDC__) || defined 
(__cplusplus)
+#  define      __P(args)       args    /* Use prototypes.  */
+#else
+#  define      __P(args)       ()      /* No prototypes.  */
+#endif
+#endif /* HAVE___P */])
 
-# libutil is a 4.4BSD library that defines several functions handy for
-# inetutil daemons, doing such things as utmp frobbing, and pty setup.
-AC_CHECK_LIB(util, logout, LIBUTIL=-lutil)
-AC_SUBST(LIBUTIL)
-# Look for the functions typically defined by libutil (which of course may
-# not actually be in libutil), and and use our own versions if necesary.
-_SAVE_LIBS="$LIBS"
-LIBS="$LIBUTIL $LIBS"
-AC_REPLACE_FUNCS(login logout logwtmp openpty forkpty ruserok iruserok 
login_tty)
-LIBS="$_SAVE_LIBS"
+
+### Checks for libraries.
+AC_CHECK_LIB(bsd, revoke)
+AC_CHECK_LIB(nsl, inet_ntoa)
+AC_CHECK_LIB(resolv, gethostname)
+AC_CHECK_LIB(socket, getpeername)
+AC_CHECK_LIB(opie, opiegenerator)
+AC_CHECK_LIB(z, gzdopen)
 
-# See if `weak refs' are possible; these make it possible (with shared
-# libraries) to check for the existance of a standard function at run-time
-# instead of compile time, which is very handy for distributing binary
-# version programs that automatically adapt -- in inetutils case, to whether
-# or not crypt is available.
-IU_CHECK_WEAK_REFS
+# We want to use libreadline if it is available.  However, it seems that the
+# guile hackers have had problems because there is a Solaris libreadline
+# that is different from the GNU libreadline; therefore we test for an obscure
+# function in the GNU libreadline.
+#AC_CHECK_LIB(termcap, tputs)
+#AC_CHECK_LIB(readline, rl_bind_key,,, -ltermcap)
+AC_CHECK_LIB(readline, rl_bind_key,
+             [LIBREADLINE=-lreadline
+              AC_DEFINE(HAVE_LIBREADLINE, 1,
+                  [Define to one if you have -lreadline])],
+             [LIBREADLINE=], "$LIBTERMCAP")
+AC_SUBST(LIBREADLINE)
+AC_SUBST(LIBTERMCAP)
 
-# See if there's a separate libcrypt (many systems put crypt there)
+dnl See if there's a separate libcrypt (many systems put crypt there)
 AC_CHECK_LIB(crypt, crypt, LIBCRYPT=-lcrypt)
 AC_SUBST(LIBCRYPT)
 
-# Check if they want support for Wrap.  Certain daemons like
-# ftpd have support for it.
-AC_ARG_WITH(wrap, [  --with-wrap    add tcp wrapper support])
-if test "$with_wrap" = yes; then
-# See if we have libwrap.a
-# we can not use AC_CHECK_LIB reliably since for the wrap lib
-# you have to define some global variables
-#AC_CHECK_LIB(wrap, hosts_ctl, LIBWRAP=-lwrap)
-  AC_MSG_CHECKING(hosts_ctl in -lwrap);
-  save_LIBS=$LIBS
-  LIBS="$save_LIBS -lwrap"
-  AC_TRY_LINK([int allow_severity = 1; int deny_severity = 1;],
-              hosts_ctl(), eval "ac_cv_lib_wrap_hosts_ctl=yes",
-              eval "ac_cv_lib_wrap_hosts_ctl=no")
-  LIBS=$save_LIBS
-  if test "$ac_cv_lib_wrap_hosts_ctl" = yes ; then
-    AC_DEFINE(WITH_WRAP)
-    LIBWRAP=-lwrap
-  fi
-  AC_MSG_RESULT($ac_cv_lib_wrap_hosts_ctl);
+# See if a termcap library is available (under one of several names)
+IU_LIB_TERMCAP
+# If not, add a bogus version of tgetent to libinetutils, as that's the only
+# function actually used (to check terminal type validity), modulo any
+# dependencies from curses.
+if test -z "$LIBTERMCAP"; then
+  # Some packages include termcap just ;
+  # for those cases, we really don't need termcap.
+  AC_LIBOBJ(stub_tgetent)
 fi
-AC_SUBST(LIBWRAP)
+
+dnl libutil is a 4.4BSD library that defines several functions handy for
+dnl inetutil daemons, doing such things as utmp frobbing, and pty setup.
+AC_CHECK_LIB(util, logout, LIBUTIL=-lutil)
+AC_SUBST(LIBUTIL)
 
 # Check if they want support for PAM.  Certain daemons like
 # ftpd have support for it.
-AC_ARG_WITH(pam, [  --with-pam    add support for PAM])
+
 # See if we have libpam.a this is for ftpd.
 if test "$with_pam" = yes ; then
   AC_CHECK_LIB(dl, dlopen)
   AC_CHECK_LIB(pam, pam_authenticate, LIBPAM=-lpam)
   if test "$ac_cv_lib_pam_pam_authenticate" = yes ; then
-     AC_DEFINE(WITH_PAM)
+     AC_DEFINE(WITH_PAM, 1, [Define to one if you have -lpam.])
   fi
 fi
 AC_SUBST(LIBPAM)
 
-# Look for the crypt function itself (in libcrypt if possible)
-_SAVE_LIBS="$LIBS"
-LIBS="$LIBCRYPT $LIBS"
-AC_CHECK_FUNCS(crypt)
-LIBS="$_SAVE_LIBS"
-# ... and see if it's declared anywhere
-IU_CHECK_DECL(crypt, [#include <unistd.h>])
-
-# Look for the posix SEEK_ macros (for lseek), and if not found, try the
-# similar berkeley L_ macros; if neither can be found, use the classic unix
-# values.
-IU_CHECK_MACRO(SEEK_ macros,
-  [#include <unistd.h>], SEEK_SET SEEK_CUR SEEK_END,
-  :,
-  IU_CHECK_MACRO(L_ seek macros,
-    [#include <unistd.h>], L_SET L_INCR L_XTND,
-    AC_DEFINE(SEEK_SET, L_SET)
-    AC_DEFINE(SEEK_CUR, L_INCR)
-    AC_DEFINE(SEEK_END, L_XTND),
-    AC_DEFINE(SEEK_SET, 0)
-    AC_DEFINE(SEEK_CUR, 1)
-    AC_DEFINE(SEEK_END, 2)))
-
-# Look for the posix _FILENO macros; if not found, use the classic unix values.
-IU_CHECK_MACRO(_FILENO macros,
-  [#include <unistd.h>], STDIN_FILENO STDOUT_FILENO STDERR_FILENO,
-  :,
-  AC_DEFINE(STDIN_FILENO, 0)
-  AC_DEFINE(STDOUT_FILENO, 1)
-  AC_DEFINE(STDERR_FILENO, 2))
-
-# See where to find fd_set (bit-vectors for select) manipulation macros.
-IU_CHECK_MACRO(fd_set macros, [#include <sys/types.h>],
-  FD_ZERO FD_CLR FD_SET FD_ISSET)
-if test "$inetutils_cv_macro_fd_set_macros" = no; then
-  IU_CHECK_MACRO(fd_set macros in <sys/time.h>, [#include <sys/time.h>],
-    FD_ZERO FD_CLR FD_SET FD_ISSET)
-fi
-
-# See if structure stat has a st_blksize member.
-AC_DIAGNOSE([obsolete],[AC_STRUCT_ST_BLKSIZE:
-        your code should no longer depend upon `HAVE_ST_BLKSIZE', but
-        `HAVE_STRUCT_STAT_ST_BLKSIZE'.  Remove this warning and
-        the `AC_DEFINE' when you adjust the code.])
-AC_CHECK_MEMBERS([struct stat.st_blksize],[AC_DEFINE(HAVE_ST_BLKSIZE, 1,
-                            [Define if your `struct stat' has
-                             `st_blksize'.  Deprecated, use
-                             `HAVE_STRUCT_STAT_ST_BLKSIZE' instead.])])
-
-
-# See if stat includes sub-second time information (the st_?timespec form is
-# from bsd, and the st_?time_usec form is used by the hurd; the latter will
-# eventually be replaced by the former).
-IU_CHECK_STRUCT_FIELD(stat, st_mtimespec,
-  [ #include <sys/types.h>
-    #include <sys/stat.h> ],
-  :,
-  IU_CHECK_STRUCT_FIELD(stat, st_mtime_usec,
-    [ #include <sys/types.h>
-      #include <sys/stat.h>]))
-
-# See if a termcap library is available (under one of several names)
-IU_LIB_TERMCAP
-# If not, add a bogus version of tgetent to libinetutils, as that's the only
-# function actually used (to check terminal type validity), modulo any
-# dependencies from curses.
-if test -z "$LIBTERMCAP"; then
-  # Some packages include termcap just ;
-  # for those cases, we really don't need termcap.
-  LIBOBJS="$LIBOBJS stub_tgetent.o"
-fi
-
 # Can we use libls? but we must have fchdir()
 if test "$enable_libls" = yes  -a "$ac_cv_func_fchdir" = yes ; then
   LIBLS="../libls/libls.a"
-  BUILD_LIBLS="libls.a"
-  AC_DEFINE(WITH_LIBLS)
+  libls_BUILD="libls.a"
+  AC_DEFINE(WITH_LIBLS, 1, [Define to one if you have -lls])
 else
   LIBLS=''
-  BUILD_LIBLS=''
+  libls_BUILD=''
 fi
 AC_SUBST(LIBLS)
-AC_SUBST(BUILD_LIBLS)
+AC_SUBST(libls_BUILD)
 
 # Only talk uses curses, so only check for it if we want that
 if test "$enable_talk" != no; then
@@ -426,19 +209,9 @@ else
     AC_MSG_WARN([curses is not available, so not building talk])
   fi
   enable_talk=no
-  BUILD_TALK=''
+  talk_BUILD=''
 fi
 
-# We may need our own definition for struct osockaddr (equivalent to the
-# old 4.3BSD struct sockaddr, and used in grotty bsd talk protocol)
-IU_CHECK_TYPE(struct osockaddr,
-    [ #include <sys/types.h>
-      #include <sys/socket.h> ],
-    :, AC_DEFINE(HAVE_OSOCKADDR_H) INCLUDES="$INCLUDES osockaddr.h")
-IU_CHECK_STRUCT_FIELD(sockaddr_in, sin_len,
-    [ #include <sys/types.h>
-      #include <netinet/in.h> ])
-
 # Look for a system `glob' function, and use our own if we can't find one (or
 # if the system one is missing features we need).
 sys_glob=no
@@ -453,21 +226,30 @@ if test "$ac_cv_header_glob_h" = yes; th
   LIBS="$_SAVE_LIBS"
 fi
 if test "$sys_glob" != yes; then
-  BUILD_LIBGLOB=libglob.a
+  libglob_BUILD=libglob.a
   LINK_SRCS="$LINK_SRCS glob/glob.h"
   LINK_DSTS="$LINK_DSTS include/glob.h"
   LINK_SRCS="$LINK_SRCS glob/fnmatch.h"
   LINK_DSTS="$LINK_DSTS include/fnmatch.h"
   LIBGLOB="-L../glob -lglob"
 else
-  BUILD_LIBGLOB=''
+  libglob_BUILD=''
 fi
 AC_SUBST(LIBGLOB)
-AC_SUBST(BUILD_LIBGLOB)
+AC_SUBST(libglob_BUILD)
 
+
+dnl FIXME: Make this test case a bit more robust.  Is there a reason why
+dnl        KRB4 exists?
 LIBAUTH=
 INCAUTH=
 if test "$enable_encryption" = yes -o "$enable_authentication" = yes; then
+  AH_TEMPLATE(KERBEROS_IV, [Define to one if you have Kerberos IV])
+  AH_TEMPLATE(KRB4, [Define to one if you have Kerberos IV])
+  AH_TEMPLATE(KERBEROS, [Define to one if you have Kerberos])
+  AH_TEMPLATE(DES_ENCRYPTION, [FIXME])
+  AH_TEMPLATE(KERBEROS_V, [FIXME])
+  
   if test $KERBEROS_VERSION -eq 4; then
     AC_CHECK_LIB(krb, krb_mk_req,
                  [LIBAUTH=-lkrb
@@ -478,7 +260,7 @@ if test "$enable_encryption" = yes -o "$
       AC_CHECK_LIB(des, des_key_sched,
                    [LIBAUTH="$LIBAUTH -ldes"],
                    -L$KERBEROS_DIR)
-      #FIXME:
+      dnl FIXME: Fix this to one test case.
       test "$enable_authentication" = yes -a "$ac_cv_lib_krb_krb_mk_req" = yes\
   && AC_DEFINE(KRB4)
       test "$enable_authentication" = yes -a "$ac_cv_lib_krb_krb_mk_req" = yes 
\
@@ -504,122 +286,326 @@ fi
 AC_SUBST(LIBAUTH)
 AC_SUBST(INCAUTH)
 
-# define CPP macros that enable auth/encrypt code
+dnl Define CPP macros that enable auth/encrypt code
 if test ".$LIBAUTH" != .; then
-  test "$enable_authentication" = yes && AC_DEFINE(AUTHENTICATION)
-  test "$enable_encryption" = yes     && AC_DEFINE(ENCRYPTION)
+  test "$enable_authentication" = yes && AC_DEFINE(AUTHENTICATION, 1,
+                   [Define to one if you want authentication.])
+  test "$enable_encryption" = yes     && AC_DEFINE(ENCRYPTION, 1,
+                   [Define to one if you want encryption.])
 fi
 
-# We use our own version of getopt (including our own header file) if the
-# system one doesn't have getopt_long.
-AC_CHECK_FUNC(getopt_long, ,
-  INCLUDES="$INCLUDES getopt.h"
-  LIBOBJS="$LIBOBJS getopt.o getopt1.o")
+dnl Check if they want support for Wrap.  Certain daemons like
+dnl ftpd have support for it.
 
-# Supply a version of poll() if the libray is missing.
-# syslogd uses poll() unconditionnaly.
-AC_CHECK_FUNC(poll, ,
-  AC_DEFINE(HAVE_POLL_H)
-  INCLUDES="$INCLUDES poll.h"
-  LIBOBJS="$LIBOBJS poll.o")
+if test "$with_wrap" = yes; then
+dnl See if we have libwrap.a
+dnl we can not use AC_CHECK_LIB reliably since for the wrap lib
+dnl you have to define some global variables
+#AC_CHECK_LIB(wrap, hosts_ctl, LIBWRAP=-lwrap)
+  AC_MSG_CHECKING(hosts_ctl in -lwrap);
+  save_LIBS=$LIBS
+  LIBS="$save_LIBS -lwrap"
+  AC_TRY_LINK([int allow_severity = 1; int deny_severity = 1;],
+              hosts_ctl(), eval "ac_cv_lib_wrap_hosts_ctl=yes",
+              eval "ac_cv_lib_wrap_hosts_ctl=no")
+  LIBS=$save_LIBS
+  if test "$ac_cv_lib_wrap_hosts_ctl" = yes ; then
+    AC_DEFINE(WITH_WRAP, 1, [Define to one if you have -lwrap.])
+    LIBWRAP=-lwrap
+  fi
+  AC_MSG_RESULT($ac_cv_lib_wrap_hosts_ctl);
+fi
+AC_SUBST(LIBWRAP)
 
-# Supply versions of the BSD error reporting functions if the system doesn't
-AC_CHECK_FUNC(verrx, ,
-  INCLUDES="$INCLUDES err.h"
-  LIBOBJS="$LIBOBJS err.o")
+
+### Checks for header files.
+AC_HEADER_STDC
+AC_HEADER_TIME
+AC_HEADER_DIRENT
+
+AC_CHECK_HEADERS(arpa/nameser.h des.h errno.h fcntl.h features.h glob.h \
+                 krb.h memory.h malloc.h netinet/in_systm.h netinet/ip.h \
+                 netinet/ip_icmp.h netinet/ip_var.h \
+                 security/pam_appl.h \
+                 shadow.h stdarg.h stdlib.h string.h stropts.h sys/tty.h \
+                 sys/utsname.h sys/ptyvar.h sys/msgbuf.h sys/filio.h \
+                 sys/ioctl_compat.h sys/cdefs.h sys/stream.h sys/mkdev.h \
+                sys/sockio.h sys/sysmacros.h sys/param.h sys/file.h \
+                sys/proc.h sys/select.h sys/time.h sys/wait.h sys/resource.h \
+                stropts.h tcpd.h termio.h termios.h utmp.h utmpx.h unistd.h \
+                 vis.h)
+
+AC_CHECK_HEADER(poll.h, , [INCLUDES="$INCLUDES poll.h"])
+
+
+### Checks for types.
+dnl Checks return type of signal handlers
+AC_TYPE_SIGNAL
+
+dnl We may need our own definition for struct osockaddr (equivalent to the
+dnl old 4.3BSD struct sockaddr, and used in grotty bsd talk protocol)
+AC_CHECK_TYPE(struct osockaddr, ,
+              AC_DEFINE(HAVE_OSOCKADDR_H, 1,
+                        [Define to one if you have <osockaddr.h>.])
+                        INCLUDES="$INCLUDES osockaddr.h",
+             [#include <sys/types.h>
+               #include <sys/socket.h> ])
+
+AC_CHECK_TYPES(struct if_nameindex, , ,
+  [#include <sys/socket.h>
+   #include <net/if.h>])
+
+dnl sig_t is the type of a signal handler (4.4BSD)
+AC_CHECK_TYPES(sig_t, , ,
+  [#include <sys/types.h>
+   #include <signal.h> ])
+AH_BOTTOM(
+[#ifndef HAVE_SIG_T
+typedef RETSIGTYPE (*sig_t) ();
+#endif])
+
+dnl sigset_t is a set of signals (4.4BSD)
+AC_CHECK_TYPE(sigset_t, , AC_DEFINE(sigset_t, unsigned long, [FIXME]),
+  [#include <sys/types.h>
+   #include <signal.h> ])
+
+dnl I'm not sure what this is, but netbsd has it; just use int if necessary.
+AC_CHECK_TYPE(sig_atomic_t, , AC_DEFINE(sig_atomic_t, int, [FIXME]),
+  [#include <sys/types.h>
+   #include <signal.h> ])
+
+AC_CHECK_TYPE(sa_family_t, , AC_DEFINE(sa_family_t, unsigned int, [FIXME]),
+    [#include <sys/types.h>
+     #ifdef HAVE_SOCKET_H
+     #include <socket.h>
+     #endif
+     #include <sys/socket.h> ])
+
+dnl Check for termio-related types and defines
+AC_CHECK_TYPES(cc_t, , ,
+ [#if defined(HAVE_TERMIOS_H)
+  # include <termios.h>
+  #elif defined(HAVE_TERMIO_H)
+  # include <termio.h>
+  #else
+  # include <sgtty.h>
+  #endif ])
+
+
+### Checks for structures.
+AC_CHECK_MEMBERS([struct sockaddr_in.sin_len], , ,
+    [ #include <sys/types.h>
+      #include <netinet/in.h> ])
 
 if test "$ac_cv_header_utmp_h" = yes; then
-  IU_CHECK_TYPE(struct lastlog, [#include <utmp.h>])
-  IU_CHECK_STRUCT_FIELD(utmp, ut_type, [#ifdef HAVE_SYS_TYPES_H
-                                        # include <sys/types.h>
-                                        #endif
-                                       #include <utmp.h>])
-  IU_CHECK_STRUCT_FIELD(utmp, ut_pid, [#ifdef HAVE_SYS_TYPES_H
-                                       # include <sys/types.h>
-                                       #endif
-                                      #include <utmp.h>])
-  IU_CHECK_STRUCT_FIELD(utmp, ut_id, [#ifdef HAVE_SYS_TYPES_H
-                                      # include <sys/types.h>
-                                      #endif
-                                     #include <utmp.h>])
-  IU_CHECK_STRUCT_FIELD(utmp, ut_user, [#ifdef HAVE_SYS_TYPES_H
-                                        # include <sys/types.h>
-                                        #endif
-                                       #include <utmp.h>])
-  IU_CHECK_STRUCT_FIELD(utmp, ut_host, [#ifdef HAVE_SYS_TYPES_H
-                                        # include <sys/types.h>
-                                        #endif
-                                       #include <utmp.h>])
-  IU_CHECK_STRUCT_FIELD(utmp, ut_tv, [#ifdef HAVE_SYS_TYPES_H
-                                      # include <sys/types.h>
-                                      #endif
-                                      #include <utmp.h>])
-  IU_CHECK_STRUCT_FIELD(utmp, ut_exit, [#ifdef HAVE_SYS_TYPES_H
-                                        # include <sys/types.h>
-                                        #endif
-                                       #include <utmp.h>])
+  AC_CHECK_TYPES(struct lastlog, , , [#include <utmp.h>])
+  AC_CHECK_MEMBERS([utmp.ut_type, utmp.ut_pid, utmp.ut_id, utmp.ut_user,
+                   utmp.ut_host, utmp.ut_tv, utmp.ut_exit], , ,
+                  [#ifdef HAVE_SYS_TYPES_H
+                    # include <sys/types.h>
+                    #endif
+                   #include <utmp.h>])
 fi
 if test "$ac_cv_header_utmpx_h" = yes; then
-  IU_CHECK_STRUCT_FIELD(utmpx, ut_tv, [#include <utmpx.h>])
+  AC_CHECK_MEMBERS([struct utmpx.ut_tv], , , [#include <utmpx.h>])
 fi
 
-IU_CHECK_TYPE(struct if_nameindex,
-  [ #include <sys/socket.h>
-    #include <net/if.h>])
-
-IU_CHECK_STRUCT_FIELD(ifreq,
-                      ifr_index,
-              [#include <sys/socket.h>
-               #include <net/if.h>])
-
-IU_CHECK_STRUCT_FIELD(ifreq,
-                      ifr_netmask,
-              [#include <sys/socket.h>
-               #include <net/if.h>])
-
-IU_CHECK_STRUCT_FIELD(ifreq,
-                      ifr_broadaddr,
-              [#include <sys/socket.h>
-               #include <net/if.h>])
-
-IU_CHECK_STRUCT_FIELD(sockaddr,
-                      sa_len,
-              [#include <sys/types.h>
-               #include <sys/socket.h>])
+AC_CHECK_MEMBERS([stuct ifreq.ifr_index, struct ifreq.ifr_netmask,
+                  struct ifreq.ifr_broadaddr], , ,
+                 [#include <sys/socket.h>
+                  #include <net/if.h>])
+
+AC_CHECK_MEMBERS([struct sockaddr.sa_len], , ,
+                 [#include <sys/types.h>
+                  #include <sys/socket.h>])
+AC_CHECK_MEMBERS([struct hostent.h_addr_list], , , [#include <netdb.h>])
+
+AC_CHECK_MEMBERS([struct stat.st_blksize])
+
+AH_BOTTOM(
+[#ifdef HAVE_SYS_PARAM_H
+#include <sys/types.h>
+#include <sys/param.h>
+#endif
+/* Get or fake the disk device blocksize.
+   Usually defined by sys/param.h (if at all).  */
+#if !defined(DEV_BSIZE) && defined(BSIZE)
+#define DEV_BSIZE BSIZE
+#endif
+#if !defined(DEV_BSIZE) && defined(BBSIZE) /* SGI */
+#define DEV_BSIZE BBSIZE
+#endif
+#ifndef DEV_BSIZE
+#define DEV_BSIZE 4096
+#endif
+
+/* Extract or fake data from a `struct stat'.
+   ST_BLKSIZE: Optimal I/O blocksize for the file, in bytes. */
+#ifndef HAVE_STRUCT_STAT_ST_BLKSIZE
+# define ST_BLKSIZE(statbuf) DEV_BSIZE
+#else /* HAVE_STRUCT_STAT_ST_BLKSIZE */
+/* Some systems, like Sequents, return st_blksize of 0 on pipes. */
+# define ST_BLKSIZE(statbuf) ((statbuf).st_blksize > 0 \
+                              ? (statbuf).st_blksize : DEV_BSIZE)
+#endif /* HAVE_STRUCT_STAT_ST_BLKSIZE */])
+
+### Checks for compiler characteristics.
+AM_C_PROTOTYPES dnl FIXME: Does inetutils even compile on pre-ANSI compilers?
+AC_C_CONST
+
+dnl See if `weak refs' are possible; these make it possible (with shared
+dnl libraries) to check for the existance of a standard function at run-time
+dnl instead of compile time, which is very handy for distributing binary
+dnl version programs that automatically adapt -- in inetutils case, to whether
+dnl or not crypt is available.
+IU_CHECK_WEAK_REFS
+
+
+### Checks for library functions.
+AC_FUNC_CLOSEDIR_VOID
+AC_FUNC_ALLOCA
+AC_FUNC_SETVBUF_REVERSED
+AC_FUNC_FORK
+AC_FUNC_STRCOLL
+AC_FUNC_MMAP
+
+AC_CHECK_FUNCS(bcopy bcmp bzero cfsetspeed cgetent dirfd fchdir flock \
+               fpathconf ftruncate \
+              getcwd getmsg getspnam initgroups initsetproctitle killpg \
+               mkstemp ptsname \
+               setegid seteuid setpgid \
+               setsid setregid setreuid setresgid setresuid setutent_r \
+               sigaction sigvec strchr setproctitle tcgetattr tzset utimes \
+               utime uname \
+               updwtmp updwtmpx vhangup wait3 wait4)
+AH_BOTTOM(
+[#ifndef HAVE_BCOPY
+#define bcopy(f,t,z) memmove(t,f,z)
+#endif])
+
+AH_BOTTOM(
+[#ifndef HAVE_BZERO
+#define bzero(x,z) memset(x,0,z)
+#endif])
+
+dnl Functions that we will define (in libinetutils) if necessary.
+AC_REPLACE_FUNCS(getpass getusershell herror memcmp memcpy memmove memset \
+                setenv strdup strcasecmp strsignal waitpid poll)
+
+dnl Look for the functions typically defined by libutil (which of course may
+dnl not actually be in libutil), and and use our own versions if necesary.
+_SAVE_LIBS="$LIBS"
+LIBS="$LIBUTIL $LIBS"
+AC_REPLACE_FUNCS(login logout logwtmp openpty forkpty ruserok iruserok 
login_tty)
+LIBS="$_SAVE_LIBS"
+
+dnl Look for the crypt function itself (in libcrypt if possible)
+_SAVE_LIBS="$LIBS"
+LIBS="$LIBCRYPT $LIBS"
+AC_CHECK_FUNCS(crypt)
+LIBS="$_SAVE_LIBS"
+
+AH_BOTTOM(
+[#ifndef HAVE_MEMCPY
+#define memcpy memmove
+#endif])
+AH_BOTTOM(
+[#if !defined(HAVE_MEMMOVE) || !defined(HAVE_MEMSET)
+/* Make sure size_t is defined */
+#include <sys/types.h>
+#endif])
+AH_BOTTOM(
+[#ifndef HAVE_MEMMOVE
+/* Declare our own silly version.  */
+extern void *memmove __P ((void *to, const void *from, size_t sz));
+#endif])
+AH_BOTTOM(
+[#ifndef HAVE_MEMSET
+/* Declare our own silly version.  */
+extern void memset __P ((void *mem, int val, size_t sz));
+#endif])
+
+dnl FIXME: I don't understand this.
+dnl If revoke hasn't been defined yet, just define a dummy version
+AC_REPLACE_FUNCS(revoke)
+
+jm_INCLUDED_REGEX(libinetutils/regex.c)
 
-# See if the system has strerror, and replace it if not
-AC_CHECK_FUNC(strerror, , LIBOBJS="$LIBOBJS strerror.o")
+AC_CHECK_FUNC(_obstack_free, ,
+  AC_LIBOBJ(obstack) INCLUDES="$INCLUDES obstack.h")
+
+dnl Use (posix) `setpgid' if it's around, otherwise assume a BSD setpgrp
+AC_CHECK_FUNC(setpgid, , AC_DEFINE(setpgid, setpgrp,
+                          [Define to `setpgrp' if you don't have `setpgid'.]))
+
+dnl We use our own version of getopt (including our own header file) if the
+dnl system one doesn't have getopt_long.
+AC_CHECK_FUNC(getopt_long, ,
+  AC_LIBOBJ(getopt)
+  AC_LIBOBJ(getopt1)
+  INCLUDES="$INCLUDES getopt.h")
+
+dnl Supply a version of poll() if the libray is missing.
+dnl syslogd uses poll() unconditionnaly.
+AC_CHECK_FUNC(poll, ,
+  AC_DEFINE(HAVE_POLL_H, 1, [Define to one if you have <poll.h>])
+  AC_LIBOBJ(poll)
+  INCLUDES="$INCLUDES poll.h")
+
+dnl Supply versions of the BSD error reporting functions if the system doesn't
+AC_CHECK_FUNC(verrx, ,
+  AC_LIBOBJ(err)
+  INCLUDES="$INCLUDES err.h")
+
+dnl See if the __PROGNAME variable is defined, otherwise use our own.
+AC_CHECK_FUNC(__progname,
+  AC_DEFINE(HAVE___PROGNAME, 1, [Define to one if you have __progname]),
+  AC_LIBOBJ(__progname))
+
+dnl See if snprintf exists, otherwise just use a bogus version
+AC_CHECK_FUNC(snprintf,
+  AC_DEFINE(HAVE_SNPRINTF, 1, [Define to one if you have snprintf]),
+  AC_LIBOBJ(snprintf))
+
+dnl See if vsnprintf exists, otherwise use our own.
+AC_CHECK_FUNC(vsnprintf,
+  AC_DEFINE(HAVE_VSNPRINTF, 1, [FIXME]),
+  AC_LIBOBJ(snprintf))
+AH_BOTTOM(
+[#ifndef HAVE_VSNPRINTF
+#include <sys/types.h>
+#if defined(HAVE_STDARG_H) && defined(__STDC__) && __STDC__
+#include <stdarg.h>
+#else
+#include <varargs.h>
+#endif
+extern int vsnprintf __P ((char *, size_t, const char *, va_list));
+#endif])
+
+dnl See if the system has strerror, and replace it if not
+AC_CHECK_FUNC(strerror, , AC_LIBOBJ(strerror))
 if test "$ac_cv_func_strerror" = no; then
   # No strerror, so see if the SYS_ERRLIST variable can be used by ours
-  AC_CHECK_FUNC(sys_errlist, AC_DEFINE(HAVE_SYS_ERRLIST))
+  AC_CHECK_FUNC(sys_errlist, AC_DEFINE(HAVE_SYS_ERRLIST, 1,
+                              [Define to one if you have sys_errlist.]))
   if test "$ac_cv_func_sys_errlist" = yes; then
-    IU_CHECK_DECL(sys_errlist, [
-      #include <stdio.h>
+    AC_CHECK_DECL(sys_errlist, , ,
+     [#include <stdio.h>
       #ifdef HAVE_ERRNO_H
       #include <errno.h>
       #endif])
   fi
 fi
 
-# See if we have h_errno (the test is here so we can use -lresolv if 
necessary).
-AC_CACHE_CHECK([for h_errno], inetutils_cv_var_h_errno,
-  AC_TRY_COMPILE([#include <netdb.h>],
-    [ extern int h_errno; int iu_x = h_errno; ],
-    inetutils_cv_var_h_errno=yes, inetutils_cv_var_h_errno=no))
-if test "$inetutils_cv_var_h_errno" = yes; then
-  AC_DEFINE(HAVE_H_ERRNO)
-  IU_CHECK_DECL(h_errno, [#include <netdb.h>])
-fi
-
-# See if the system has hstrerror, and replace it if not
-AC_CHECK_FUNC(hstrerror, , LIBOBJS="$LIBOBJS hstrerror.o")
+dnl See if the system has hstrerror, and replace it if not
+AC_CHECK_FUNC(hstrerror, , AC_LIBOBJ(hstrerror))
 if test "$ac_cv_func_hstrerror" = yes; then
-  IU_CHECK_DECL(hstrerror, [#include <netdb.h>])
+  AC_CHECK_DECL(hstrerror, , , [#include <netdb.h>])
 else
   # No hstrerror, so see if the H_ERRLIST variable can be used by ours
   AC_CHECK_FUNC(h_errlist)
   if test "$ac_cv_func_h_errlist" = yes; then
-    IU_CHECK_DECL(h_errlist, [#include <netdb.h>])
+    AC_CHECK_DECL(h_errlist, , , [#include <netdb.h>])
   fi
 fi
 if test "$ac_cv_func_hstrerror" = yes -o "$ac_cv_func_h_errlist" = yes; then
@@ -627,124 +613,194 @@ if test "$ac_cv_func_hstrerror" = yes -o
   # We still provide some definition, regardless, but this allows people to use
   # a reasonable alternative if the situation allows, rather than using a
   # degenerate version that only says `Host lookup error N'.
-  AC_DEFINE(HAVE_HSTRERROR)
+  AC_DEFINE(HAVE_HSTRERROR, 1, [Define to one if you have hstrerror.])
 fi
 
-IU_CHECK_STRUCT_FIELD(hostent, h_addr_list, [#include <netdb.h>])
+AH_BOTTOM(
+[#ifndef HAVE_DECL_HSTRERROR
+extern const char *hstrerror __P ((int));
+#endif])
+
+## Checks for function declarations.
 
-# Checks return type of signal handlers
-AC_TYPE_SIGNAL
 AC_DECL_SYS_SIGLIST
-# sig_t is the type of a signal handler (4.4BSD)
-IU_CHECK_TYPE(sig_t,
-  [ #include <sys/types.h>
-    #include <signal.h> ])
-# sigset_t is a set of signals (4.4BSD)
-IU_CHECK_TYPE(sigset_t,
-  [ #include <sys/types.h>
-    #include <signal.h> ],
-  :, AC_DEFINE(sigset_t, unsigned long))
-# I'm not sure what this is, but netbsd has it; just use int if necessary.
-IU_CHECK_TYPE(sig_atomic_t,
-  [ #include <sys/types.h>
-    #include <signal.h> ],
-  :, AC_DEFINE(sig_atomic_t, int))
-
-
-IU_CHECK_TYPE(sa_family_t,
-  [
-    #include <sys/types.h>
-    #ifdef HAVE_SOCKET_H
-    #include <socket.h>
-    #endif
-    #include <sys/socket.h> ],
-  :, AC_DEFINE(sa_family_t, unsigned int))
 
-# See if the __PROGNAME variable is defined, otherwise use our own.
-AC_CHECK_FUNC(__progname,
-  AC_DEFINE(HAVE___PROGNAME),
-  LIBOBJS="$LIBOBJS __progname.o")
+AC_CHECK_DECL(crypt, , , [#include <unistd.h>])
 
-# See if snprintf exists, otherwise just use a bogus version
-AC_CHECK_FUNC(snprintf,
-  AC_DEFINE(HAVE_SNPRINTF),
-  LIBOBJS="$LIBOBJS snprintf.o")
+dnl EWOULDBLOCK is more or less the BSD version of posix EAGAIN.
+IU_CHECK_MACRO(EWOULDBLOCK, [#include <errno.h>], , ,
+  AC_DEFINE(EWOULDBLOCK, EAGAIN, 1, [FIXME]))
+AC_CHECK_DECL(errno, , , [#include <errno.h>])
+
+dnl See whether <syslog.h> will declare special internal stuff if we define
+dnl SYSLOG_NAMES before including it.  We check for various syslog internal
+dnl macros, the typedef `CODE', and the variable `prioritynames'.
+define([iu_syslog_includes],
+  [[ #ifdef HAVE_STDLIB_H
+     #include <stdlib.h>
+     #endif
+     #define SYSLOG_NAMES
+     #include <syslog.h> ]])
+IU_CHECK_MACRO(syslog internal macros,
+  iu_syslog_includes,
+  [LOG_MAKEPRI LOG_PRI LOG_FAC],
+  AC_CHECK_TYPE(CODE,
+    AC_CHECK_DECL(prioritynames,
+      AC_DEFINE(HAVE_SYSLOG_INTERNAL, 1, [FIXME]),
+      INCLUDES="$INCLUDES syslog-int.h",
+      iu_syslog_includes),
+    INCLUDES="$INCLUDES syslog-int.h", iu_syslog_includes),
+  INCLUDES="$INCLUDES syslog-int.h")
+undefine([iu_syslog_includes])
 
-# See if vsnprintf exists, otherwise use our own.
-AC_CHECK_FUNC(vsnprintf,
-  AC_DEFINE(HAVE_VSNPRINTF),
-  LIBOBJS="$LIBOBJS snprintf.o")
+dnl Some systems don't declare common functions (especially if they return
+dnl int), at least in the expected header file.  Check.
+AC_CHECK_DECLS([fclose, pclose], , , [#include <stdio.h>])
+AC_CHECK_DECLS([getcwd, getlogin, getpass, getusershell, ttyname], , ,
+               [#include <unistd.h>])
+AH_BOTTOM(
+[#ifndef HAVE_DECL_GETLOGIN
+extern char *getlogin __P((void));
+#endif])
+AH_BOTTOM(
+[#ifndef HAVE_DECL_GETCWD
+extern char *getcwd __P((char *, size_t));
+#endif])
+AH_BOTTOM(
+[#ifndef HAVE_DECL_GETPASS
+extern char *getpass __P((const char *));
+#endif])
+AH_BOTTOM(
+[#ifndef HAVE_DECL_TTYNAME
+extern char *ttyname __P ((int));
+#endif])
+
+AC_CHECK_DECLS([strerror, strchr], , , [#include <string.h>])
+AH_BOTTOM(
+[#ifndef HAVE_DECL_STRERROR
+extern const char *strerror __P ((int));
+#endif])
+AH_BOTTOM(
+[#ifndef HAVE_DECL_STRCHR
+extern char *strchr __P ((char *str, int ch));
+extern char *strrchr __P ((char *str, int ch));
+#endif
+#ifndef HAVE_STRCHR
+#define strchr index
+#define strrchr rindex
+#endif])
+
+AC_CHECK_DECLS([getgrnam, initgroups], , , [#include <grp.h>])
+AH_BOTTOM(
+[#ifndef HAVE_DECl_GETGRNAM
+extern struct group *getgrnam __P ((const char *));
+#endif])
 
-# We want to use libreadline if it is available.  However, it seems that the
-# guile hackers have had problems because there is a Solaris libreadline
-# that is different from the GNU libreadline; therefore we test for an obscure
-# function in the GNU libreadline.
-#AC_CHECK_LIB(termcap, tputs)
-#AC_CHECK_LIB(readline, rl_bind_key,,, -ltermcap)
-AC_CHECK_LIB(readline, rl_bind_key,
-             [LIBREADLINE=-lreadline
-              AC_DEFINE(HAVE_LIBREADLINE)],
-             [LIBREADLINE=], "$LIBTERMCAP")
-AC_SUBST(LIBREADLINE)
-AC_SUBST(LIBTERMCAP)
+AC_CHECK_DECLS(htons, , ,
+  [ #ifdef HAVE_SYS_TYPES_H
+    # include <sys/types.h>
+    #endif
+    #ifdef HAVE_SYS_PARAM_H
+    # include <sys/param.h>
+    #endif
+    #include <netinet/in.h> ])
 
-AC_CHECK_LIB(opie, opiegenerator)
+if test "$ac_cv_func_setenv" = no; then
+  dnl Our home-grown version of setenv needs to use ENVIRON
+  AC_CHECK_DECLS(environ, , ,
+    [ #ifdef HAVE_UNISTD_H
+      # include <unistd.h>
+      #endif
+      #ifdef HAVE_STDLIB_H
+      # include <stdlib.h>
+      #endif ])
+fi
 
-AC_CHECK_LIB(z, gzdopen)
+dnl See if we have h_errno (the test is here so we can use -lresolv
+dnl if necessary).
+AC_CACHE_CHECK([for h_errno], inetutils_cv_var_h_errno,
+  AC_TRY_COMPILE([#include <netdb.h>],
+    [ extern int h_errno; int iu_x = h_errno; ],
+    inetutils_cv_var_h_errno=yes, inetutils_cv_var_h_errno=no))
+if test "$inetutils_cv_var_h_errno" = yes; then
+  dnl FIXME: Isn't this wrong? Shouldn't the declaration check define
+  dnl        this if we find h_errno?
+  AC_DEFINE(HAVE_H_ERRNO, 1, [Define to one if you have h_errno.])
+  AC_CHECK_DECL(h_errno, , , [#include <netdb.h>])
+fi
 
-# Check for termio-related types and defines
-IU_CHECK_TYPE(cc_t,
- [ #if defined(HAVE_TERMIOS_H)
-   # include <termios.h>
-   #elif defined(HAVE_TERMIO_H)
-   # include <termio.h>
-   #else
-   # include <sgtty.h>
-   #endif ])
+## Checks for CPP macros.
+dnl Look for the posix SEEK_ macros (for lseek), and if not found, try the
+dnl similar berkeley L_ macros; if neither can be found, use the classic unix
+dnl values.
+IU_CHECK_MACRO(SEEK_ macros,
+  [#include <unistd.h>], SEEK_SET SEEK_CUR SEEK_END,
+  :,
+  IU_CHECK_MACRO(L_ seek macros,
+    [#include <unistd.h>], L_SET L_INCR L_XTND,
+    AC_DEFINE(SEEK_SET, L_SET, [FIXME])
+    AC_DEFINE(SEEK_CUR, L_INCR, [FIXME])
+    AC_DEFINE(SEEK_END, L_XTND, [FIXME]),
+    AC_DEFINE(SEEK_SET, 0, [FIXME])
+    AC_DEFINE(SEEK_CUR, 1, [FIXME])
+    AC_DEFINE(SEEK_END, 2, [FIXME])))
 
-# For now, we always use libexecdir; later we may want to vary where the
-# daemons go.
-inetdaemondir='$(libexecdir)'
-AC_SUBST(inetdaemondir)
+dnl Look for the posix _FILENO macros; if not found, use the classic unix 
values.
+IU_CHECK_MACRO(_FILENO macros,
+  [#include <unistd.h>], STDIN_FILENO STDOUT_FILENO STDERR_FILENO,
+  :,
+  AC_DEFINE(STDIN_FILENO, 0, [FIXME])
+  AC_DEFINE(STDOUT_FILENO, 1, [FIXME])
+  AC_DEFINE(STDERR_FILENO, 2, [FIXME]))
 
-# Configure paths used by inetutils programs.  See the file `paths' for
-# details.
+dnl See where to find fd_set (bit-vectors for select) manipulation macros.
+IU_CHECK_MACRO(fd_set macros, [#include <sys/types.h>],
+  FD_ZERO FD_CLR FD_SET FD_ISSET)
+if test "$inetutils_cv_macro_fd_set_macros" = no; then
+  IU_CHECK_MACRO(fd_set macros in <sys/time.h>, [#include <sys/time.h>],
+    FD_ZERO FD_CLR FD_SET FD_ISSET)
+fi
+
+dnl Configure paths used by inetutils programs.  See the file `paths' for
+dnl details.
 PATHDEFS_MAKE=pathdefs.make
 PATHS_DEFS=paths.defs
 IU_CONFIG_PATHS($srcdir/paths, PATHDEFS_MAKE, PATHS_DEFS)
+AH_BOTTOM(
+[/* Defaults for PATH_ variables.  */
+#include <include/confpaths.h>])
 
-# Supply optional header files by linking a copy into the object include dir
+dnl Supply optional header files by linking a copy into the object include dir
 LINK_SRCS="$LINK_SRCS `for I in $INCLUDES; do echo $ac_n ' 'headers/$I$ac_c; 
done`"
 LINK_DSTS="$LINK_DSTS `for I in $INCLUDES; do echo $ac_n ' 'include/$I$ac_c; 
done`"
 ac_sources="$LINK_SRCS"
 ac_dests="$LINK_DSTS"
 while test -n "$ac_sources"; do
-  set $ac_dests; ac_dest=$1; shift; ac_dests=$*
-  set $ac_sources; ac_source=$1; shift; ac_sources=$*
+  set $ac_dests
+  ac_dest=$1
+  shift
+  ac_dests=$*
+  set $ac_sources
+  ac_source=$1
+  shift
+  ac_sources=$*
   ac_config_links_1="$ac_config_links_1 $ac_dest:$ac_source"
 done
 AC_CONFIG_LINKS([$ac_config_links_1])
 
-AC_FUNC_MMAP
-
-AC_SUBST(VERSION)
-
-# Ok this is the end of the rope, even autoconf can't help.
-# For example on certain system login(1) will not work if we
-# don't have an entry in utmpx.
-# Also for some OS they are better handle with STREAMS
+dnl Ok this is the end of the rope, even autoconf can't help.
+dnl For example on certain system login(1) will not work if we
+dnl don't have an entry in utmpx.
+dnl Also for some OS they are better handle with STREAMS
 case "$host" in
 *olaris*)
-  AC_DEFINE(SOLARIS)
-  AC_DEFINE(UTMPX)
-  AC_DEFINE(SOLARIS)
-  AC_DEFINE(HAVE_STREAMSPTY)
+  AC_DEFINE(SOLARIS, 1, [FIXME])
+  AC_DEFINE(UTMPX, 1, [FIXME])
+  AC_DEFINE(HAVE_STREAMSPTY, 1, [FIXME])
   ;;
-*irix*)
-  AC_DEFINE(UTMPX)
-  ;;
-*hpux*)
-  AC_DEFINE(UTMPX)
+*irix* | *hpux*)
+  AC_DEFINE(UTMPX, 1, [FIXME])
+  AC_DEFINE(UTMPX, 1, [FIXME])
   ;;
 esac
 
@@ -760,4 +816,3 @@ include/confpaths.h:headers/confpaths.h.
 headers/Makefile include/version.h:headers/version.h.in
 doc/Makefile doc/rfc/Makefile])
 AC_OUTPUT
-
Index: ftp/Makefile.am
===================================================================
RCS file: /cvsroot/inetutils/inetutils/ftp/Makefile.am,v
retrieving revision 1.10
diff -u -p -r1.10 Makefile.am
--- ftp/Makefile.am     4 Apr 2002 23:55:33 -0000       1.10
+++ ftp/Makefile.am     21 Apr 2002 18:15:33 -0000
@@ -1,6 +1,6 @@
 AUTOMAKE_OPTIONS = ../ansi2knr
 
-bin_PROGRAMS = @BUILD_FTP@
+bin_PROGRAMS = @ftp_BUILD@
 
 EXTRA_PROGRAMS = ftp
 
Index: ftp/ftp.c
===================================================================
RCS file: /cvsroot/inetutils/inetutils/ftp/ftp.c,v
retrieving revision 1.22
diff -u -p -r1.22 ftp.c
--- ftp/ftp.c   27 Feb 2001 17:07:12 -0000      1.22
+++ ftp/ftp.c   21 Apr 2002 18:15:34 -0000
@@ -84,12 +84,12 @@ static char sccsid[] = "@(#)ftp.c   8.6 (B
 
 #include "ftp_var.h"
 
-#ifndef HAVE_FCLOSE_DECL
+#ifndef HAVE_DECL_FCLOSE
 /* Some systems don't declare fclose in <stdio.h>, so do it ourselves.  */
 extern int fclose __P ((FILE *));
 #endif
 
-#ifndef HAVE_PCLOSE_DECL
+#ifndef HAVE_DECL_PCLOSE
 /* Some systems don't declare pclose in <stdio.h>, so do it ourselves.  */
 extern int pclose __P ((FILE *));
 #endif
Index: ftpd/Makefile.am
===================================================================
RCS file: /cvsroot/inetutils/inetutils/ftpd/Makefile.am,v
retrieving revision 1.18
diff -u -p -r1.18 Makefile.am
--- ftpd/Makefile.am    11 Feb 2002 04:17:00 -0000      1.18
+++ ftpd/Makefile.am    21 Apr 2002 18:15:34 -0000
@@ -2,7 +2,7 @@ AUTOMAKE_OPTIONS = ../ansi2knr
 
 inetdaemondir = @inetdaemondir@
 
-inetdaemon_PROGRAMS = @BUILD_FTPD@
+inetdaemon_PROGRAMS = @ftpd_BUILD@
 
 EXTRA_PROGRAMS = ftpd
 
Index: ftpd/extern.h
===================================================================
RCS file: /cvsroot/inetutils/inetutils/ftpd/extern.h,v
retrieving revision 1.8
diff -u -p -r1.8 extern.h
--- ftpd/extern.h       23 Aug 2000 02:52:20 -0000      1.8
+++ ftpd/extern.h       21 Apr 2002 18:15:34 -0000
@@ -40,7 +40,7 @@ extern void dologout       __P ((int));
 extern void fatal          __P ((const char *));
 extern int  ftpd_pclose    __P ((FILE *));
 extern FILE *ftpd_popen    __P ((char *, const char *));
-#ifndef HAVE_GETUSERSHELL_DECL
+#ifndef HAVE_DECL_GETUSERSHELL
 extern char *getusershell  __P ((void));
 #endif
 extern void logwtmp        __P ((const char *, const char *, const char *));
Index: ftpd/ftpd.c
===================================================================
RCS file: /cvsroot/inetutils/inetutils/ftpd/ftpd.c,v
retrieving revision 1.48
diff -u -p -r1.48 ftpd.c
--- ftpd/ftpd.c 2 Nov 2001 21:50:13 -0000       1.48
+++ ftpd/ftpd.c 21 Apr 2002 18:15:34 -0000
@@ -129,7 +129,7 @@ static char sccsid[] = "@(#)ftpd.c  8.5 (
 # define MAP_FAILED (void*)-1
 #endif
 
-#ifndef HAVE_FCLOSE_DECL
+#ifndef HAVE_DECL_FCLOSE
 /* Some systems don't declare fclose in <stdio.h>, so do it ourselves.  */
 extern int fclose __P ((FILE *));
 #endif
Index: glob/Makefile.am
===================================================================
RCS file: /cvsroot/inetutils/inetutils/glob/Makefile.am,v
retrieving revision 1.6
diff -u -p -r1.6 Makefile.am
--- glob/Makefile.am    13 Feb 2002 08:47:15 -0000      1.6
+++ glob/Makefile.am    21 Apr 2002 18:15:34 -0000
@@ -2,7 +2,7 @@ AUTOMAKE_OPTIONS = ../ansi2knr
 
 INCLUDES=-I$(top_builddir)/include
 
-noinst_LIBRARIES = @BUILD_LIBGLOB@
+noinst_LIBRARIES = @libglob_BUILD@
 
 EXTRA_LIBRARIES = libglob.a
 
Index: gwhois/Makefile.am
===================================================================
RCS file: /cvsroot/inetutils/inetutils/gwhois/Makefile.am,v
retrieving revision 1.6
diff -u -p -r1.6 Makefile.am
--- gwhois/Makefile.am  11 Feb 2002 04:17:00 -0000      1.6
+++ gwhois/Makefile.am  21 Apr 2002 18:15:34 -0000
@@ -1,6 +1,6 @@
 AUTOMAKE_OPTIONS = ../ansi2knr
 
-bin_PROGRAMS = @BUILD_WHOIS@
+bin_PROGRAMS = @whois_BUILD@
 
 INCLUDES = -I$(top_builddir)/include
 
Index: headers/crypt.h
===================================================================
RCS file: /cvsroot/inetutils/inetutils/headers/crypt.h,v
retrieving revision 1.5
diff -u -p -r1.5 crypt.h
--- headers/crypt.h     11 Jan 1997 03:39:14 -0000      1.5
+++ headers/crypt.h     21 Apr 2002 18:15:34 -0000
@@ -19,14 +19,14 @@
 #ifndef __CRYPT_H__
 #define __CRYPT_H__
 
-#ifdef HAVE_CRYPT_DECL
+#ifdef HAVE_DECL_CRYPT
 /* Avoid arg-mismatch with system decl by being vague.  */
 #define CRYPT_ARGS ()
 #else
 #define CRYPT_ARGS __P ((char *str, char salt[2]))
 #endif
 
-#ifndef HAVE_CRYPT_DECL
+#ifndef HAVE_DECL_CRYPT
 #ifdef HAVE_ATTR_WEAK_REFS
 extern char *crypt CRYPT_ARGS __attribute__ ((weak));
 #else /* !HAVE_ATTR_WEAK_REFS */
Index: ifconfig/Makefile.am
===================================================================
RCS file: /cvsroot/inetutils/inetutils/ifconfig/Makefile.am,v
retrieving revision 1.4
diff -u -p -r1.4 Makefile.am
--- ifconfig/Makefile.am        23 Jun 2001 03:25:10 -0000      1.4
+++ ifconfig/Makefile.am        21 Apr 2002 18:15:34 -0000
@@ -4,7 +4,7 @@ OMIT_DEPENDENCIES=crypt.h err.h getopt.h
 
 SUBDIRS=system
 
-bin_PROGRAMS = @BUILD_IFCONFIG@
+bin_PROGRAMS = @ifconfig_BUILD@
 
 EXTRA_PROGRAMS = ifconfig
 
Index: inetd/Makefile.am
===================================================================
RCS file: /cvsroot/inetutils/inetutils/inetd/Makefile.am,v
retrieving revision 1.10
diff -u -p -r1.10 Makefile.am
--- inetd/Makefile.am   11 Feb 2002 04:17:00 -0000      1.10
+++ inetd/Makefile.am   21 Apr 2002 18:15:34 -0000
@@ -2,7 +2,7 @@ AUTOMAKE_OPTIONS = ../ansi2knr
 
 inetdaemondir = @inetdaemondir@
 
-inetdaemon_PROGRAMS = @BUILD_INETD@
+inetdaemon_PROGRAMS = @inetd_BUILD@
 
 EXTRA_PROGRAMS = inetd
 
Index: libinetutils/herror.c
===================================================================
RCS file: /cvsroot/inetutils/inetutils/libinetutils/herror.c,v
retrieving revision 1.3
diff -u -p -r1.3 herror.c
--- libinetutils/herror.c       19 Jul 2000 04:08:38 -0000      1.3
+++ libinetutils/herror.c       21 Apr 2002 18:15:34 -0000
@@ -35,14 +35,14 @@
 #include <netdb.h>
 
 #ifdef HAVE_H_ERRNO
-# ifndef HAVE_H_ERRNO_DECL
+# ifndef HAVE_DECL_H_ERRNO
 extern int h_errno;
-# endif /* !HAVE_H_ERRNO_DECL */
+# endif /* !HAVE_DECL_H_ERRNO */
 #else /* !HAVE_H_ERRNO */
 # ifdef HAVE_ERRNO_H
 #  include <errno.h>
 # endif
-# ifndef HAVE_ERRNO_DECL
+# ifndef HAVE_DECL_ERRNO
 extern int errno;
 # endif
 #endif /* HAVE_H_ERRNO */
Index: libinetutils/hstrerror.c
===================================================================
RCS file: /cvsroot/inetutils/inetutils/libinetutils/hstrerror.c,v
retrieving revision 1.3
diff -u -p -r1.3 hstrerror.c
--- libinetutils/hstrerror.c    19 Jul 2000 04:08:38 -0000      1.3
+++ libinetutils/hstrerror.c    21 Apr 2002 18:15:34 -0000
@@ -23,7 +23,7 @@
 #include <stdio.h>
 #include <netdb.h>
 
-#if defined (HAVE_H_ERRLIST) && !defined (HAVE_H_ERRLIST_DECL)
+#if defined (HAVE_H_ERRLIST) && !defined (HAVE_DECL_H_ERRLIST)
 extern int h_nerrs;
 extern char *h_errlist[];
 #endif
Index: libinetutils/logwtmp.c
===================================================================
RCS file: /cvsroot/inetutils/inetutils/libinetutils/logwtmp.c,v
retrieving revision 1.3
diff -u -p -r1.3 logwtmp.c
--- libinetutils/logwtmp.c      19 Jul 2000 04:08:38 -0000      1.3
+++ libinetutils/logwtmp.c      21 Apr 2002 18:15:34 -0000
@@ -56,7 +56,7 @@
 #include <string.h>
 #endif
 
-#ifndef HAVE_ERRNO_DECL
+#ifndef HAVE_DECL_ERRNO
 extern int errno;
 #endif
 
Index: libinetutils/revoke.c
===================================================================
RCS file: /cvsroot/inetutils/inetutils/libinetutils/revoke.c,v
retrieving revision 1.2
diff -u -p -r1.2 revoke.c
--- libinetutils/revoke.c       19 Jul 2000 04:08:38 -0000      1.2
+++ libinetutils/revoke.c       21 Apr 2002 18:15:34 -0000
@@ -6,7 +6,7 @@
 
 #include <errno.h>
 
-#ifndef HAVE_ERRNO_DECL
+#ifndef HAVE_DECL_ERRNO
 extern int errno;
 #endif
 
Index: libinetutils/setenv.c
===================================================================
RCS file: /cvsroot/inetutils/inetutils/libinetutils/setenv.c,v
retrieving revision 1.4
diff -u -p -r1.4 setenv.c
--- libinetutils/setenv.c       19 Jul 2000 04:08:38 -0000      1.4
+++ libinetutils/setenv.c       21 Apr 2002 18:15:34 -0000
@@ -22,7 +22,7 @@
 
 #include <errno.h>
 #if !_LIBC
-# if !defined(errno) && !defined(HAVE_ERRNO_DECL)
+# if !defined(errno) && !defined(HAVE_DECL_ERRNO)
 extern int errno;
 # endif
 # define __set_errno(ev) ((errno) = (ev))
@@ -40,7 +40,7 @@ extern int errno;
 
 #if _LIBC - 0 == 0
 # define __environ     environ
-# ifndef HAVE_ENVIRON_DECL
+# ifndef HAVE_DECL_ENVIRON
 extern char **environ;
 # endif
 #endif
Index: libls/Makefile.am
===================================================================
RCS file: /cvsroot/inetutils/inetutils/libls/Makefile.am,v
retrieving revision 1.7
diff -u -p -r1.7 Makefile.am
--- libls/Makefile.am   11 Feb 2002 04:17:00 -0000      1.7
+++ libls/Makefile.am   21 Apr 2002 18:15:34 -0000
@@ -2,7 +2,7 @@ AUTOMAKE_OPTIONS = ../ansi2knr
 
 INCLUDES=-I$(top_builddir)/include
 
-noinst_LIBRARIES = @BUILD_LIBLS@
+noinst_LIBRARIES = @libls_BUILD@
 
 EXTRA_LIBRARIES = libls.a
 
Index: logger/Makefile.am
===================================================================
RCS file: /cvsroot/inetutils/inetutils/logger/Makefile.am,v
retrieving revision 1.4
diff -u -p -r1.4 Makefile.am
--- logger/Makefile.am  11 Feb 2002 04:17:01 -0000      1.4
+++ logger/Makefile.am  21 Apr 2002 18:15:34 -0000
@@ -2,7 +2,7 @@ AUTOMAKE_OPTIONS = ../ansi2knr
 
 INCLUDES = -I$(top_builddir)/include
 
-bin_PROGRAMS = @BUILD_LOGGER@
+bin_PROGRAMS = @logger_BUILD@
 
 LDADD = -L../libinetutils -linetutils
 
Index: ping/Makefile.am
===================================================================
RCS file: /cvsroot/inetutils/inetutils/ping/Makefile.am,v
retrieving revision 1.11
diff -u -p -r1.11 Makefile.am
--- ping/Makefile.am    11 Feb 2002 04:17:01 -0000      1.11
+++ ping/Makefile.am    21 Apr 2002 18:15:34 -0000
@@ -1,7 +1,8 @@
 AUTOMAKE_OPTIONS = ../ansi2knr
 
-bin_PROGRAMS = @BUILD_PING@
-EXTRA_PROGRAMS=ping
+bin_PROGRAMS = @ping_BUILD@
+
+EXTRA_PROGRAMS = ping
 
 man_MANS = ping.8
 EXTRA_DIST = $(man_MANS)
Index: rcp/Makefile.am
===================================================================
RCS file: /cvsroot/inetutils/inetutils/rcp/Makefile.am,v
retrieving revision 1.8
diff -u -p -r1.8 Makefile.am
--- rcp/Makefile.am     11 Feb 2002 04:17:01 -0000      1.8
+++ rcp/Makefile.am     21 Apr 2002 18:15:34 -0000
@@ -1,6 +1,6 @@
 AUTOMAKE_OPTIONS = ../ansi2knr
 
-bin_PROGRAMS = @BUILD_RCP@
+bin_PROGRAMS = @rcp_BUILD@
 
 EXTRA_PROGRAMS = rcp
 
Index: rcp/rcp.c
===================================================================
RCS file: /cvsroot/inetutils/inetutils/rcp/rcp.c,v
retrieving revision 1.17
diff -u -p -r1.17 rcp.c
--- rcp/rcp.c   22 Nov 2001 21:53:14 -0000      1.17
+++ rcp/rcp.c   21 Apr 2002 18:15:34 -0000
@@ -83,7 +83,7 @@ static char sccsid[] = "@(#)rcp.c     8.2 (B
 
 #include "extern.h"
 
-#ifndef HAVE_STRERROR_DECL
+#ifndef HAVE_DECL_STRERROR
 extern const char *strerror __P ((int));
 #endif
 
Index: rexecd/Makefile.am
===================================================================
RCS file: /cvsroot/inetutils/inetutils/rexecd/Makefile.am,v
retrieving revision 1.8
diff -u -p -r1.8 Makefile.am
--- rexecd/Makefile.am  11 Feb 2002 04:17:01 -0000      1.8
+++ rexecd/Makefile.am  21 Apr 2002 18:15:34 -0000
@@ -2,7 +2,7 @@ AUTOMAKE_OPTIONS = ../ansi2knr
 
 inetdaemondir = @inetdaemondir@
 
-inetdaemon_PROGRAMS = @BUILD_REXECD@
+inetdaemon_PROGRAMS = @rexecd_BUILD@
 
 EXTRA_PROGRAMS = rexecd
 
Index: rlogin/Makefile.am
===================================================================
RCS file: /cvsroot/inetutils/inetutils/rlogin/Makefile.am,v
retrieving revision 1.7
diff -u -p -r1.7 Makefile.am
--- rlogin/Makefile.am  11 Feb 2002 04:17:01 -0000      1.7
+++ rlogin/Makefile.am  21 Apr 2002 18:15:34 -0000
@@ -2,7 +2,7 @@ AUTOMAKE_OPTIONS = ../ansi2knr
 
 INCLUDES = -I$(top_builddir)/include
 
-bin_PROGRAMS = @BUILD_RLOGIN@
+bin_PROGRAMS = @rlogin_BUILD@
 
 EXTRA_PROGRAMS = rlogin
 
Index: rlogind/Makefile.am
===================================================================
RCS file: /cvsroot/inetutils/inetutils/rlogind/Makefile.am,v
retrieving revision 1.9
diff -u -p -r1.9 Makefile.am
--- rlogind/Makefile.am 11 Feb 2002 04:17:01 -0000      1.9
+++ rlogind/Makefile.am 21 Apr 2002 18:15:34 -0000
@@ -2,7 +2,7 @@ AUTOMAKE_OPTIONS = ../ansi2knr
 
 inetdaemondir = @inetdaemondir@
 
-inetdaemon_PROGRAMS = @BUILD_RLOGIND@
+inetdaemon_PROGRAMS = @rlogind_BUILD@
 
 EXTRA_PROGRAMS = rlogind
 
Index: rsh/Makefile.am
===================================================================
RCS file: /cvsroot/inetutils/inetutils/rsh/Makefile.am,v
retrieving revision 1.6
diff -u -p -r1.6 Makefile.am
--- rsh/Makefile.am     11 Feb 2002 04:17:01 -0000      1.6
+++ rsh/Makefile.am     21 Apr 2002 18:15:34 -0000
@@ -1,6 +1,6 @@
 AUTOMAKE_OPTIONS = ../ansi2knr
 
-bin_PROGRAMS = @BUILD_RSH@
+bin_PROGRAMS = @rsh_BUILD@
 
 EXTRA_PROGRAMS = rsh
 
Index: rshd/Makefile.am
===================================================================
RCS file: /cvsroot/inetutils/inetutils/rshd/Makefile.am,v
retrieving revision 1.8
diff -u -p -r1.8 Makefile.am
--- rshd/Makefile.am    11 Feb 2002 04:17:01 -0000      1.8
+++ rshd/Makefile.am    21 Apr 2002 18:15:34 -0000
@@ -2,7 +2,7 @@ AUTOMAKE_OPTIONS = ../ansi2knr
 
 inetdaemondir = @inetdaemondir@
 
-inetdaemon_PROGRAMS = @BUILD_RSHD@
+inetdaemon_PROGRAMS = @rshd_BUILD@
 
 EXTRA_PROGRAMS = rshd
 
Index: syslogd/Makefile.am
===================================================================
RCS file: /cvsroot/inetutils/inetutils/syslogd/Makefile.am,v
retrieving revision 1.8
diff -u -p -r1.8 Makefile.am
--- syslogd/Makefile.am 11 Feb 2002 04:17:01 -0000      1.8
+++ syslogd/Makefile.am 21 Apr 2002 18:15:34 -0000
@@ -2,7 +2,7 @@ AUTOMAKE_OPTIONS = ../ansi2knr
 
 inetdaemondir = @inetdaemondir@
 
-inetdaemon_PROGRAMS = @BUILD_SYSLOGD@
+inetdaemon_PROGRAMS = @syslogd_BUILD@
 
 EXTRA_PROGRAMS = syslogd
 
Index: talk/Makefile.am
===================================================================
RCS file: /cvsroot/inetutils/inetutils/talk/Makefile.am,v
retrieving revision 1.6
diff -u -p -r1.6 Makefile.am
--- talk/Makefile.am    11 Feb 2002 04:17:01 -0000      1.6
+++ talk/Makefile.am    21 Apr 2002 18:15:34 -0000
@@ -1,6 +1,6 @@
 AUTOMAKE_OPTIONS = ../ansi2knr
 
-bin_PROGRAMS = @BUILD_TALK@
+bin_PROGRAMS = @talk_BUILD@
 
 EXTRA_PROGRAMS = talk
 
Index: talkd/Makefile.am
===================================================================
RCS file: /cvsroot/inetutils/inetutils/talkd/Makefile.am,v
retrieving revision 1.10
diff -u -p -r1.10 Makefile.am
--- talkd/Makefile.am   11 Feb 2002 04:17:01 -0000      1.10
+++ talkd/Makefile.am   21 Apr 2002 18:15:34 -0000
@@ -2,7 +2,7 @@ AUTOMAKE_OPTIONS = ../ansi2knr
 
 inetdaemondir = @inetdaemondir@
 
-inetdaemon_PROGRAMS = @BUILD_TALKD@
+inetdaemon_PROGRAMS = @talkd_BUILD@
 
 EXTRA_PROGRAMS = talkd
 
@@ -14,7 +14,7 @@ talkd_SOURCES = \
  table.c\
  talkd.c\
  intalkd.h
- 
+
 man_MANS = talkd.8
 
 @PATHDEFS_MAKE@
Index: telnet/Makefile.am
===================================================================
RCS file: /cvsroot/inetutils/inetutils/telnet/Makefile.am,v
retrieving revision 1.6
diff -u -p -r1.6 Makefile.am
--- telnet/Makefile.am  11 Feb 2002 04:17:01 -0000      1.6
+++ telnet/Makefile.am  21 Apr 2002 18:15:34 -0000
@@ -1,6 +1,6 @@
 AUTOMAKE_OPTIONS = ../ansi2knr
 
-bin_PROGRAMS = @BUILD_TELNET@
+bin_PROGRAMS = @telnet_BUILD@
 
 EXTRA_PROGRAMS = telnet
 
Index: telnet/authenc.c
===================================================================
RCS file: /cvsroot/inetutils/inetutils/telnet/authenc.c,v
retrieving revision 1.5
diff -u -p -r1.5 authenc.c
--- telnet/authenc.c    19 Jul 2000 04:08:38 -0000      1.5
+++ telnet/authenc.c    21 Apr 2002 18:15:34 -0000
@@ -85,7 +85,7 @@ telnet_getenv(char *val)
 char *
 telnet_gets(char *prompt, char *result, int length, int echo)
 {
-#ifndef HAVE_GETPASS_DECL
+#ifndef HAVE_DECL_GETPASS
        extern char *getpass();
 #endif
        extern int globalmode;
Index: telnet/commands.c
===================================================================
RCS file: /cvsroot/inetutils/inetutils/telnet/commands.c,v
retrieving revision 1.13
diff -u -p -r1.13 commands.c
--- telnet/commands.c   19 Jul 2000 04:08:38 -0000      1.13
+++ telnet/commands.c   21 Apr 2002 18:15:34 -0000
@@ -2355,7 +2355,7 @@ tn(int argc, char *argv[])
                return 0;
            }
        } else {
-#ifndef HAVE_HTONS_DECL
+#ifndef HAVE_DECL_HTONS
 #ifndef htons
            u_short htons __P((unsigned short));
 #endif
Index: telnetd/Makefile.am
===================================================================
RCS file: /cvsroot/inetutils/inetutils/telnetd/Makefile.am,v
retrieving revision 1.11
diff -u -p -r1.11 Makefile.am
--- telnetd/Makefile.am 8 Apr 2002 14:05:10 -0000       1.11
+++ telnetd/Makefile.am 21 Apr 2002 18:15:34 -0000
@@ -2,7 +2,7 @@ AUTOMAKE_OPTIONS = ../ansi2knr
 
 inetdaemondir = @inetdaemondir@
 
-inetdaemon_PROGRAMS = @BUILD_TELNETD@
+inetdaemon_PROGRAMS = @telnetd_BUILD@
 
 EXTRA_PROGRAMS = telnetd
 
Index: tftp/Makefile.am
===================================================================
RCS file: /cvsroot/inetutils/inetutils/tftp/Makefile.am,v
retrieving revision 1.6
diff -u -p -r1.6 Makefile.am
--- tftp/Makefile.am    11 Feb 2002 04:17:01 -0000      1.6
+++ tftp/Makefile.am    21 Apr 2002 18:15:34 -0000
@@ -2,7 +2,7 @@ AUTOMAKE_OPTIONS = ../ansi2knr
 
 INCLUDES = -I$(top_builddir)/include
 
-bin_PROGRAMS = @BUILD_TFTP@
+bin_PROGRAMS = @tftp_BUILD@
 
 EXTRA_PROGRAMS = tftp
 
Index: tftp/tftp.c
===================================================================
RCS file: /cvsroot/inetutils/inetutils/tftp/tftp.c,v
retrieving revision 1.9
diff -u -p -r1.9 tftp.c
--- tftp/tftp.c 2 Nov 2001 21:50:13 -0000       1.9
+++ tftp/tftp.c 21 Apr 2002 18:15:34 -0000
@@ -68,11 +68,11 @@ static char sccsid[] = "@(#)tftp.c  8.1 (
 #include "extern.h"
 #include "tftpsubs.h"
 
-#ifndef HAVE_ERRNO_DECL
+#ifndef HAVE_DECL_ERRNO
 extern int errno;
 #endif
 
-#ifndef HAVE_STRERROR_DECL
+#ifndef HAVE_DECL_STRERROR
 extern const char *strerror __P ((int));
 #endif
 
Index: tftpd/Makefile.am
===================================================================
RCS file: /cvsroot/inetutils/inetutils/tftpd/Makefile.am,v
retrieving revision 1.7
diff -u -p -r1.7 Makefile.am
--- tftpd/Makefile.am   11 Feb 2002 04:17:02 -0000      1.7
+++ tftpd/Makefile.am   21 Apr 2002 18:15:34 -0000
@@ -2,7 +2,7 @@ AUTOMAKE_OPTIONS = ../ansi2knr
 
 inetdaemondir = @inetdaemondir@
 
-inetdaemon_PROGRAMS = @BUILD_TFTPD@
+inetdaemon_PROGRAMS = @tftpd_BUILD@
 
 INCLUDES = -I$(top_builddir)/include
 
Index: tftpd/tftpd.c
===================================================================
RCS file: /cvsroot/inetutils/inetutils/tftpd/tftpd.c,v
retrieving revision 1.12
diff -u -p -r1.12 tftpd.c
--- tftpd/tftpd.c       2 Nov 2001 21:50:13 -0000       1.12
+++ tftpd/tftpd.c       21 Apr 2002 18:15:34 -0000
@@ -75,7 +75,7 @@ static char sccsid[] = "@(#)tftpd.c   8.1 
 
 #include "tftpsubs.h"
 
-#ifndef HAVE_STRERROR_DECL
+#ifndef HAVE_DECL_STRERROR
 extern const char *strerror __P ((int));
 #endif
 
Index: uucpd/Makefile.am
===================================================================
RCS file: /cvsroot/inetutils/inetutils/uucpd/Makefile.am,v
retrieving revision 1.9
diff -u -p -r1.9 Makefile.am
--- uucpd/Makefile.am   11 Feb 2002 04:17:02 -0000      1.9
+++ uucpd/Makefile.am   21 Apr 2002 18:15:34 -0000
@@ -2,7 +2,7 @@ AUTOMAKE_OPTIONS = ../ansi2knr
 
 inetdaemondir = @inetdaemondir@
 
-inetdaemon_PROGRAMS = @BUILD_UUCPD@
+inetdaemon_PROGRAMS = @uucpd_BUILD@
 
 EXTRA_PROGRAMS = uucpd
 
Index: whois/Makefile.am
===================================================================
RCS file: /cvsroot/inetutils/inetutils/whois/Makefile.am,v
retrieving revision 1.8
diff -u -p -r1.8 Makefile.am
--- whois/Makefile.am   24 Aug 2000 05:51:23 -0000      1.8
+++ whois/Makefile.am   21 Apr 2002 18:15:34 -0000
@@ -1,6 +1,6 @@
 AUTOMAKE_OPTIONS = ../ansi2knr
 
-bin_PROGRAMS = @BUILD_WHOIS@
+bin_PROGRAMS = @whois_BUILD@
 
 EXTRA_PROGRAMS = whois
 

-- 
Alfred M. Szmidt



reply via email to

[Prev in Thread] Current Thread [Next in Thread]