import of heimdal 0.3e

5 files changed, 1010 insertions, 982 deletions

diff --git a/crypto/heimdal/include/Makefile.am b/crypto/heimdal/include/Makefile.am
index f9d240b..8ca0f75 100644
--- a/crypto/heimdal/include/Makefile.am
+++ b/crypto/heimdal/include/Makefile.am
@@ -1,4 +1,4 @@
-# $Id: Makefile.am,v 1.30 1999/12/21 17:03:11 assar Exp $
+# $Id: Makefile.am,v 1.31 2000/07/02 16:08:29 assar Exp $
 
 include $(top_srcdir)/Makefile.am.common
 
@@ -39,6 +39,7 @@ CLEANFILES =		\
 	krb5_err.h	\
 	md4.h		\
 	md5.h		\
+	rc4.h		\
 	otp.h		\
 	parse_time.h	\
 	parse_units.h	\
diff --git a/crypto/heimdal/include/Makefile.in b/crypto/heimdal/include/Makefile.in
index dd23443..705f743 100644
--- a/crypto/heimdal/include/Makefile.in
+++ b/crypto/heimdal/include/Makefile.in
@@ -1,6 +1,6 @@
-# Makefile.in generated automatically by automake 1.4 from Makefile.am
+# Makefile.in generated automatically by automake 1.4a from Makefile.am
 
-# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
+# Copyright (C) 1994, 1995-9, 2000 Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -10,15 +10,6 @@
 # even the implied warranty of MERCHANTABILITY or FITNESS FOR A
 # PARTICULAR PURPOSE.
 
-# $Id: Makefile.am,v 1.30 1999/12/21 17:03:11 assar Exp $
-
-
-# $Id: Makefile.am.common,v 1.3 1999/04/01 14:58:43 joda Exp $
-
-
-# $Id: Makefile.am.common,v 1.13 1999/11/01 03:19:58 assar Exp $
-
-
 SHELL = @SHELL@
 
 srcdir = @srcdir@
@@ -40,8 +31,6 @@ mandir = @mandir@
 includedir = @includedir@
 oldincludedir = /usr/include
 
-DESTDIR =
-
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
@@ -54,9 +43,10 @@ AUTOMAKE = @AUTOMAKE@
 AUTOHEADER = @AUTOHEADER@
 
 INSTALL = @INSTALL@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS)
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_FLAG =
 transform = @program_transform_name@
 
 NORMAL_INSTALL = :
@@ -65,26 +55,39 @@ POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
+
+@SET_MAKE@
 host_alias = @host_alias@
 host_triplet = @host@
-AFS_EXTRA_LD = @AFS_EXTRA_LD@
 AIX_EXTRA_KAFS = @AIX_EXTRA_KAFS@
+AMDEP = @AMDEP@
+AMTAR = @AMTAR@
+AS = @AS@
 AWK = @AWK@
 CANONICAL_HOST = @CANONICAL_HOST@
 CATMAN = @CATMAN@
 CATMANEXT = @CATMANEXT@
 CC = @CC@
+CPP = @CPP@
+CXX = @CXX@
+CXXCPP = @CXXCPP@
 DBLIB = @DBLIB@
+DEPDIR = @DEPDIR@
+DIR_des = @DIR_des@
+DIR_roken = @DIR_roken@
+DLLTOOL = @DLLTOOL@
 EXEEXT = @EXEEXT@
 EXTRA_LIB45 = @EXTRA_LIB45@
 GROFF = @GROFF@
+INCLUDES_roken = @INCLUDES_roken@
 INCLUDE_ = @INCLUDE_@
-LD = @LD@
 LEX = @LEX@
 LIBOBJS = @LIBOBJS@
 LIBTOOL = @LIBTOOL@
 LIB_ = @LIB_@
 LIB_AUTH_SUBDIRS = @LIB_AUTH_SUBDIRS@
+LIB_des = @LIB_des@
+LIB_des_appl = @LIB_des_appl@
 LIB_kdb = @LIB_kdb@
 LIB_otp = @LIB_otp@
 LIB_roken = @LIB_roken@
@@ -92,22 +95,32 @@ LIB_security = @LIB_security@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
 MAKEINFO = @MAKEINFO@
-MAKE_X_PROGS_BIN_PROGS = @MAKE_X_PROGS_BIN_PROGS@
-MAKE_X_PROGS_BIN_SCRPTS = @MAKE_X_PROGS_BIN_SCRPTS@
-MAKE_X_PROGS_LIBEXEC_PROGS = @MAKE_X_PROGS_LIBEXEC_PROGS@
 NEED_WRITEAUTH_FALSE = @NEED_WRITEAUTH_FALSE@
 NEED_WRITEAUTH_TRUE = @NEED_WRITEAUTH_TRUE@
-NM = @NM@
 NROFF = @NROFF@
+OBJDUMP = @OBJDUMP@
 OBJEXT = @OBJEXT@
 PACKAGE = @PACKAGE@
 RANLIB = @RANLIB@
+STRIP = @STRIP@
 VERSION = @VERSION@
 VOID_RETSIGTYPE = @VOID_RETSIGTYPE@
 WFLAGS = @WFLAGS@
 WFLAGS_NOIMPLICITINT = @WFLAGS_NOIMPLICITINT@
 WFLAGS_NOUNUSED = @WFLAGS_NOUNUSED@
 YACC = @YACC@
+dpagaix_CFLAGS = @dpagaix_CFLAGS@
+dpagaix_LDADD = @dpagaix_LDADD@
+install_sh = @install_sh@
+
+# $Id: Makefile.am,v 1.31 2000/07/02 16:08:29 assar Exp $
+
+
+# $Id: Makefile.am.common,v 1.3 1999/04/01 14:58:43 joda Exp $
+
+
+# $Id: Makefile.am.common,v 1.23 2000/12/05 09:11:09 joda Exp $
+
 
 AUTOMAKE_OPTIONS = foreign no-dependencies
 
@@ -117,6 +130,8 @@ INCLUDES = -DHOST=\"$(CANONICAL_HOST)\"
 
 AM_CFLAGS =  $(WFLAGS)
 
+CP = cp
+
 COMPILE_ET = $(top_builddir)/lib/com_err/compile_et
 
 buildinclude = $(top_builddir)/include
@@ -136,6 +151,7 @@ LIB_getsockopt = @LIB_getsockopt@
 LIB_logout = @LIB_logout@
 LIB_logwtmp = @LIB_logwtmp@
 LIB_odm_initialize = @LIB_odm_initialize@
+LIB_pidfile = @LIB_pidfile@
 LIB_readline = @LIB_readline@
 LIB_res_search = @LIB_res_search@
 LIB_setpcred = @LIB_setpcred@
@@ -144,6 +160,8 @@ LIB_socket = @LIB_socket@
 LIB_syslog = @LIB_syslog@
 LIB_tgetent = @LIB_tgetent@
 
+LIBS = @LIBS@
+
 HESIODLIB = @HESIODLIB@
 HESIODINCLUDE = @HESIODINCLUDE@
 INCLUDE_hesiod = @INCLUDE_hesiod@
@@ -152,24 +170,20 @@ LIB_hesiod = @LIB_hesiod@
 INCLUDE_krb4 = @INCLUDE_krb4@
 LIB_krb4 = @LIB_krb4@
 
+INCLUDE_openldap = @INCLUDE_openldap@
+LIB_openldap = @LIB_openldap@
+
 INCLUDE_readline = @INCLUDE_readline@
 
 LEXLIB = @LEXLIB@
 
-cat1dir = $(mandir)/cat1
-cat3dir = $(mandir)/cat3
-cat5dir = $(mandir)/cat5
-cat8dir = $(mandir)/cat8
-
-MANRX = \(.*\)\.\([0-9]\)
-CATSUFFIX = @CATSUFFIX@
-
 NROFF_MAN = groff -mandoc -Tascii
 
-@KRB4_TRUE@LIB_kafs = $(top_builddir)/lib/kafs/libkafs.la $(AIX_EXTRA_KAFS)
+@KRB4_TRUE@LIB_kafs = @KRB4_TRUE@$(top_builddir)/lib/kafs/libkafs.la $(AIX_EXTRA_KAFS)
 
-@KRB5_TRUE@LIB_krb5 = $(top_builddir)/lib/krb5/libkrb5.la 	$(top_builddir)/lib/asn1/libasn1.la
-@KRB5_TRUE@LIB_gssapi = $(top_builddir)/lib/gssapi/libgssapi.la
+@KRB5_TRUE@LIB_krb5 = @KRB5_TRUE@$(top_builddir)/lib/krb5/libkrb5.la \
+@KRB5_TRUE@	$(top_builddir)/lib/asn1/libasn1.la
+@KRB5_TRUE@LIB_gssapi = @KRB5_TRUE@$(top_builddir)/lib/gssapi/libgssapi.la
 CHECK_LOCAL = 
 
 SUBDIRS = kadm5
@@ -178,8 +192,43 @@ noinst_PROGRAMS = bits
 
 include_HEADERS = krb5-types.h
 
-CLEANFILES =  	asn1.h			asn1_err.h		base64.h		com_err.h		com_right.h		der.h			des.h			editline.h		err.h			getarg.h		glob.h			gssapi.h		hdb.h			hdb_asn1.h		hdb_err.h		heim_err.h		kafs.h			krb5-protos.h		krb5-private.h		krb5-types.h		krb5.h			krb5_err.h		md4.h			md5.h			otp.h			parse_time.h		parse_units.h		resolve.h		roken-common.h		roken.h			sha.h			sl.h			xdbm.h
+CLEANFILES = \
+	asn1.h		\
+	asn1_err.h	\
+	base64.h	\
+	com_err.h	\
+	com_right.h	\
+	der.h		\
+	des.h		\
+	editline.h	\
+	err.h		\
+	getarg.h	\
+	glob.h		\
+	gssapi.h	\
+	hdb.h		\
+	hdb_asn1.h	\
+	hdb_err.h	\
+	heim_err.h	\
+	kafs.h		\
+	krb5-protos.h	\
+	krb5-private.h	\
+	krb5-types.h	\
+	krb5.h		\
+	krb5_err.h	\
+	md4.h		\
+	md5.h		\
+	rc4.h		\
+	otp.h		\
+	parse_time.h	\
+	parse_units.h	\
+	resolve.h	\
+	roken-common.h	\
+	roken.h		\
+	sha.h		\
+	sl.h		\
+	xdbm.h
 
+subdir = include
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = config.h
 CONFIG_CLEAN_FILES = 
@@ -190,7 +239,6 @@ PROGRAMS =  $(noinst_PROGRAMS)
 DEFS = @DEFS@ -I. -I$(srcdir) -I.
 CPPFLAGS = @CPPFLAGS@
 LDFLAGS = @LDFLAGS@
-LIBS = @LIBS@
 X_CFLAGS = @X_CFLAGS@
 X_LIBS = @X_LIBS@
 X_EXTRA_LIBS = @X_EXTRA_LIBS@
@@ -200,26 +248,28 @@ bits_OBJECTS =  bits.$(OBJEXT)
 bits_LDADD = $(LDADD)
 bits_DEPENDENCIES = 
 bits_LDFLAGS = 
-CFLAGS = @CFLAGS@
 COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
 LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+CFLAGS = @CFLAGS@
 CCLD = $(CC)
-LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@
+LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+DIST_SOURCES =  bits.c
 HEADERS =  $(include_HEADERS)
 
-DIST_COMMON =  ./stamp-h.in Makefile.am Makefile.in config.h.in
+depcomp = 
+DIST_COMMON =  $(include_HEADERS) ./stamp-h.in Makefile.am Makefile.in \
+config.h.in
 
 
-DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 
-TAR = tar
 GZIP_ENV = --best
 SOURCES = bits.c
 OBJECTS = bits.$(OBJEXT)
 
 all: all-redirect
 .SUFFIXES:
-.SUFFIXES: .1 .3 .5 .8 .S .c .cat1 .cat3 .cat5 .cat8 .et .h .lo .o .obj .s .x
+.SUFFIXES: .1 .3 .5 .8 .c .cat1 .cat3 .cat5 .cat8 .et .h .lo .o .obj .x
 $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) $(top_srcdir)/Makefile.am.common $(top_srcdir)/cf/Makefile.am.common
 	cd $(top_srcdir) && $(AUTOMAKE) --foreign include/Makefile
 
@@ -234,18 +284,22 @@ config.h: stamp-h
 		$(MAKE) stamp-h; \
 	else :; fi
 stamp-h: $(srcdir)/config.h.in $(top_builddir)/config.status
+	@rm -f stamp-h stamp-hT
+	@echo timestamp > stamp-hT 2> /dev/null
 	cd $(top_builddir) \
 	  && CONFIG_FILES= CONFIG_HEADERS=include/config.h \
 	     $(SHELL) ./config.status
-	@echo timestamp > stamp-h 2> /dev/null
-$(srcdir)/config.h.in: $(srcdir)/stamp-h.in
+	@mv stamp-hT stamp-h
+$(srcdir)/config.h.in: $(srcdir)/./stamp-h.in
 	@if test ! -f $@; then \
-		rm -f $(srcdir)/stamp-h.in; \
-		$(MAKE) $(srcdir)/stamp-h.in; \
+		rm -f $(srcdir)/./stamp-h.in; \
+		$(MAKE) $(srcdir)/./stamp-h.in; \
 	else :; fi
-$(srcdir)/stamp-h.in: $(top_srcdir)/configure.in $(ACLOCAL_M4) 
+$(srcdir)/./stamp-h.in: $(top_srcdir)/configure.in $(ACLOCAL_M4) $(top_srcdir)/acconfig.h
+	@rm -f $(srcdir)/./stamp-h.in $(srcdir)/./stamp-h.inT
+	@echo timestamp > $(srcdir)/./stamp-h.inT 2> /dev/null
 	cd $(top_srcdir) && $(AUTOHEADER)
-	@echo timestamp > $(srcdir)/stamp-h.in 2> /dev/null
+	@mv $(srcdir)/./stamp-h.inT $(srcdir)/./stamp-h.in
 
 mostlyclean-hdr:
 
@@ -265,20 +319,6 @@ distclean-noinstPROGRAMS:
 
 maintainer-clean-noinstPROGRAMS:
 
-.c.o:
-	$(COMPILE) -c $<
-
-# FIXME: We should only use cygpath when building on Windows,
-# and only if it is available.
-.c.obj:
-	$(COMPILE) -c `cygpath -w $<`
-
-.s.o:
-	$(COMPILE) -c $<
-
-.S.o:
-	$(COMPILE) -c $<
-
 mostlyclean-compile:
 	-rm -f *.o core *.core
 	-rm -f *.$(OBJEXT)
@@ -290,15 +330,6 @@ distclean-compile:
 
 maintainer-clean-compile:
 
-.c.lo:
-	$(LIBTOOL) --mode=compile $(COMPILE) -c $<
-
-.s.lo:
-	$(LIBTOOL) --mode=compile $(COMPILE) -c $<
-
-.S.lo:
-	$(LIBTOOL) --mode=compile $(COMPILE) -c $<
-
 mostlyclean-libtool:
 	-rm -f *.lo
 
@@ -312,20 +343,29 @@ maintainer-clean-libtool:
 bits$(EXEEXT): $(bits_OBJECTS) $(bits_DEPENDENCIES)
 	@rm -f bits$(EXEEXT)
 	$(LINK) $(bits_LDFLAGS) $(bits_OBJECTS) $(bits_LDADD) $(LIBS)
+.c.o:
+	$(COMPILE) -c $<
+.c.obj:
+	$(COMPILE) -c `cygpath -w $<`
+.c.lo:
+	$(LTCOMPILE) -c -o $@ $<
 
 install-includeHEADERS: $(include_HEADERS)
 	@$(NORMAL_INSTALL)
 	$(mkinstalldirs) $(DESTDIR)$(includedir)
 	@list='$(include_HEADERS)'; for p in $$list; do \
 	  if test -f "$$p"; then d= ; else d="$(srcdir)/"; fi; \
-	  echo " $(INSTALL_DATA) $$d$$p $(DESTDIR)$(includedir)/$$p"; \
-	  $(INSTALL_DATA) $$d$$p $(DESTDIR)$(includedir)/$$p; \
+	  f="`echo $$p | sed -e 's|^.*/||'`"; \
+	  echo " $(INSTALL_DATA) $$d$$p $(DESTDIR)$(includedir)/$$f"; \
+	  $(INSTALL_DATA) $$d$$p $(DESTDIR)$(includedir)/$$f; \
 	done
 
 uninstall-includeHEADERS:
 	@$(NORMAL_UNINSTALL)
-	list='$(include_HEADERS)'; for p in $$list; do \
-	  rm -f $(DESTDIR)$(includedir)/$$p; \
+	@list='$(include_HEADERS)'; for p in $$list; do \
+	  f="`echo $$p | sed -e 's|^.*/||'`"; \
+	  echo " rm -f $(DESTDIR)$(includedir)/$$f"; \
+	  rm -f $(DESTDIR)$(includedir)/$$f; \
 	done
 
 # This directory's subdirectories are mostly independent; you can cd
@@ -335,8 +375,6 @@ uninstall-includeHEADERS:
 #     (which will cause the Makefiles to be regenerated when you run `make');
 # (2) otherwise, pass the desired values on the `make' command line.
 
-@SET_MAKE@
-
 all-recursive install-data-recursive install-exec-recursive \
 installdirs-recursive install-recursive uninstall-recursive  \
 check-recursive installcheck-recursive info-recursive dvi-recursive:
@@ -364,7 +402,7 @@ maintainer-clean-recursive:
 	dot_seen=no; \
 	rev=''; list='$(SUBDIRS)'; for subdir in $$list; do \
 	  rev="$$subdir $$rev"; \
-	  test "$$subdir" = "." && dot_seen=yes; \
+	  if test "$$subdir" = "."; then dot_seen=yes; else :; fi; \
 	done; \
 	test "$$dot_seen" = "no" && rev=". $$rev"; \
 	target=`echo $@ | sed s/-recursive//`; \
@@ -385,15 +423,17 @@ tags-recursive:
 
 tags: TAGS
 
-ID: $(HEADERS) $(SOURCES) $(LISP)
-	list='$(SOURCES) $(HEADERS)'; \
-	unique=`for i in $$list; do echo $$i; done | \
-	  awk '    { files[$$0] = 1; } \
+ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+	list='$(SOURCES) $(HEADERS) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '    { files[$$0] = 1; } \
 	       END { for (i in files) print i; }'`; \
-	here=`pwd` && cd $(srcdir) \
-	  && mkid -f$$here/ID $$unique $(LISP)
+	mkid -fID $$unique $(LISP)
 
-TAGS: tags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) $(LISP)
+TAGS: tags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \
+		$(TAGS_FILES) $(LISP)
 	tags=; \
 	here=`pwd`; \
 	list='$(SUBDIRS)'; for subdir in $$list; do \
@@ -401,12 +441,14 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) $(LI
 	    test -f $$subdir/TAGS && tags="$$tags -i $$here/$$subdir/TAGS"; \
    fi; \
 	done; \
-	list='$(SOURCES) $(HEADERS)'; \
-	unique=`for i in $$list; do echo $$i; done | \
-	  awk '    { files[$$0] = 1; } \
+	list='$(SOURCES) $(HEADERS) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '    { files[$$0] = 1; } \
 	       END { for (i in files) print i; }'`; \
 	test -z "$(ETAGS_ARGS)config.h.in$$unique$(LISP)$$tags" \
-	  || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags config.h.in $$unique $(LISP) -o $$here/TAGS)
+	  || etags $(ETAGS_ARGS) $$tags config.h.in $$unique $(LISP)
 
 mostlyclean-tags:
 
@@ -419,17 +461,16 @@ maintainer-clean-tags:
 
 distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
 
-subdir = include
-
 distdir: $(DISTFILES)
 	@for file in $(DISTFILES); do \
 	  d=$(srcdir); \
 	  if test -d $$d/$$file; then \
-	    cp -pr $$/$$file $(distdir)/$$file; \
+	    cp -pR $$d/$$file $(distdir) \
+	    || exit 1; \
 	  else \
 	    test -f $(distdir)/$$file \
-	    || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
-	    || cp -p $$d/$$file $(distdir)/$$file || :; \
+	    || cp -p $$d/$$file $(distdir)/$$file \
+	    || exit 1; \
 	  fi; \
 	done
 	for subdir in $(SUBDIRS); do \
@@ -437,7 +478,6 @@ distdir: $(DISTFILES)
 	    test -d $(distdir)/$$subdir \
 	    || mkdir $(distdir)/$$subdir \
 	    || exit 1; \
-	    chmod 777 $(distdir)/$$subdir; \
 	    (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir=../$(top_distdir) distdir=../$(distdir)/$$subdir distdir) \
 	      || exit 1; \
 	  fi; \
@@ -471,7 +511,7 @@ uninstall: uninstall-recursive
 all-am: Makefile $(PROGRAMS) $(HEADERS) config.h all-local
 all-redirect: all-recursive-am
 install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_STRIP_FLAG=-s install
 installdirs: installdirs-recursive
 installdirs-am:
 	$(mkinstalldirs)  $(DESTDIR)$(includedir)
@@ -487,6 +527,7 @@ distclean-generic:
 	-rm -f config.cache config.log stamp-h stamp-h[0-9]*
 
 maintainer-clean-generic:
+	-rm -f Makefile.in
 mostlyclean-am:  mostlyclean-hdr mostlyclean-noinstPROGRAMS \
 		mostlyclean-compile mostlyclean-libtool \
 		mostlyclean-tags mostlyclean-generic
@@ -521,18 +562,18 @@ clean-noinstPROGRAMS maintainer-clean-noinstPROGRAMS \
 mostlyclean-compile distclean-compile clean-compile \
 maintainer-clean-compile mostlyclean-libtool distclean-libtool \
 clean-libtool maintainer-clean-libtool uninstall-includeHEADERS \
-install-includeHEADERS install-data-recursive uninstall-data-recursive \
-install-exec-recursive uninstall-exec-recursive installdirs-recursive \
-uninstalldirs-recursive all-recursive check-recursive \
-installcheck-recursive info-recursive dvi-recursive \
-mostlyclean-recursive distclean-recursive clean-recursive \
+install-includeHEADERS install-recursive uninstall-recursive \
+install-data-recursive uninstall-data-recursive install-exec-recursive \
+uninstall-exec-recursive installdirs-recursive uninstalldirs-recursive \
+all-recursive check-recursive installcheck-recursive info-recursive \
+dvi-recursive mostlyclean-recursive distclean-recursive clean-recursive \
 maintainer-clean-recursive tags tags-recursive mostlyclean-tags \
 distclean-tags clean-tags maintainer-clean-tags distdir info-am info \
 dvi-am dvi check-local check check-am installcheck-am installcheck \
 all-recursive-am install-exec-am install-exec install-data-local \
 install-data-am install-data install-am install uninstall-am uninstall \
-all-local all-redirect all-am all installdirs-am installdirs \
-mostlyclean-generic distclean-generic clean-generic \
+all-local all-redirect all-am all install-strip installdirs-am \
+installdirs mostlyclean-generic distclean-generic clean-generic \
 maintainer-clean-generic clean mostlyclean distclean maintainer-clean
 
 
@@ -541,7 +582,10 @@ install-suid-programs:
 	for file in $$foo; do \
 	x=$(DESTDIR)$(bindir)/$$file; \
 	if chown 0:0 $$x && chmod u+s $$x; then :; else \
-	chmod 0 $$x; fi; done
+	echo "*"; \
+	echo "* Failed to install $$x setuid root"; \
+	echo "*"; \
+	fi; done
 
 install-exec-hook: install-suid-programs
 
@@ -553,8 +597,8 @@ install-build-headers:: $(include_HEADERS) $(build_HEADERZ)
 		else file="$$f"; fi; \
 		if cmp -s  $$file $(buildinclude)/$$f 2> /dev/null ; then \
 		: ; else \
-			echo " cp $$file $(buildinclude)/$$f"; \
-			cp $$file $(buildinclude)/$$f; \
+			echo " $(CP) $$file $(buildinclude)/$$f"; \
+			$(CP) $$file $(buildinclude)/$$f; \
 		fi ; \
 	done
 
@@ -623,87 +667,8 @@ dist-cat8-mans:
 
 dist-hook: dist-cat1-mans dist-cat3-mans dist-cat5-mans dist-cat8-mans
 
-install-cat1-mans:
-	@ext=1;\
-	foo='$(man1_MANS)'; \
-	bar='$(man_MANS)'; \
-	for i in $$bar; do \
-	case $$i in \
-	*.1) foo="$$foo $$i";; \
-	esac; done; \
-	if test "$$foo"; then \
-		$(mkinstalldirs) $(DESTDIR)$(cat1dir); \
-		for x in $$foo; do \
-			f=`echo $$x | sed 's/\.[^.]*$$/.cat1/'`; \
-			if test -f "$(srcdir)/$$f"; then \
-				b=`echo $$x | sed 's!$(MANRX)!\1!'`; \
-				echo "$(INSTALL_DATA) $(srcdir)/$$f $(DESTDIR)$(cat1dir)/$$b.$(CATSUFFIX)";\
-				$(INSTALL_DATA) $(srcdir)/$$g $(DESTDIR)$(cat1dir)/$$b.$(CATSUFFIX);\
-			 fi; \
-		done ;\
-	fi
-
-install-cat3-mans:
-	@ext=3;\
-	foo='$(man3_MANS)'; \
-	bar='$(man_MANS)'; \
-	for i in $$bar; do \
-	case $$i in \
-	*.3) foo="$$foo $$i";; \
-	esac; done; \
-	if test "$$foo"; then \
-		$(mkinstalldirs) $(DESTDIR)$(cat3dir); \
-		for x in $$foo; do \
-			f=`echo $$x | sed 's/\.[^.]*$$/.cat3/'`; \
-			if test -f "$(srcdir)/$$f"; then \
-				b=`echo $$x | sed 's!$(MANRX)!\1!'`; \
-				echo "$(INSTALL_DATA) $(srcdir)/$$f $(DESTDIR)$(cat3dir)/$$b.$(CATSUFFIX)";\
-				$(INSTALL_DATA) $(srcdir)/$$g $(DESTDIR)$(cat3dir)/$$b.$(CATSUFFIX);\
-			 fi; \
-		done ;\
-	fi
-
-install-cat5-mans:
-	@ext=5;\
-	foo='$(man5_MANS)'; \
-	bar='$(man_MANS)'; \
-	for i in $$bar; do \
-	case $$i in \
-	*.5) foo="$$foo $$i";; \
-	esac; done; \
-	if test "$$foo"; then \
-		$(mkinstalldirs) $(DESTDIR)$(cat5dir); \
-		for x in $$foo; do \
-			f=`echo $$x | sed 's/\.[^.]*$$/.cat5/'`; \
-			if test -f "$(srcdir)/$$f"; then \
-				b=`echo $$x | sed 's!$(MANRX)!\1!'`; \
-				echo "$(INSTALL_DATA) $(srcdir)/$$f $(DESTDIR)$(cat5dir)/$$b.$(CATSUFFIX)";\
-				$(INSTALL_DATA) $(srcdir)/$$g $(DESTDIR)$(cat5dir)/$$b.$(CATSUFFIX);\
-			 fi; \
-		done ;\
-	fi
-
-install-cat8-mans:
-	@ext=8;\
-	foo='$(man8_MANS)'; \
-	bar='$(man_MANS)'; \
-	for i in $$bar; do \
-	case $$i in \
-	*.8) foo="$$foo $$i";; \
-	esac; done; \
-	if test "$$foo"; then \
-		$(mkinstalldirs) $(DESTDIR)$(cat8dir); \
-		for x in $$foo; do \
-			f=`echo $$x | sed 's/\.[^.]*$$/.cat8/'`; \
-			if test -f "$(srcdir)/$$f"; then \
-				b=`echo $$x | sed 's!$(MANRX)!\1!'`; \
-				echo "$(INSTALL_DATA) $(srcdir)/$$f $(DESTDIR)$(cat8dir)/$$b.$(CATSUFFIX)";\
-				$(INSTALL_DATA) $(srcdir)/$$g $(DESTDIR)$(cat8dir)/$$b.$(CATSUFFIX);\
-			 fi; \
-		done ;\
-	fi
-
-install-cat-mans: install-cat1-mans install-cat3-mans install-cat5-mans install-cat8-mans
+install-cat-mans:
+	$(SHELL) $(top_srcdir)/cf/install-catman.sh "$(INSTALL_DATA)" "$(mkinstalldirs)" "$(srcdir)" "$(DESTDIR)$(mandir)" '$(CATMANEXT)' $(man_MANS) $(man1_MANS) $(man3_MANS) $(man5_MANS) $(man8_MANS)
 
 install-data-local: install-cat-mans
 
diff --git a/crypto/heimdal/include/bits.c b/crypto/heimdal/include/bits.c
index 5eb9bd0..0c8fcdd 100644
--- a/crypto/heimdal/include/bits.c
+++ b/crypto/heimdal/include/bits.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997 - 1999 Kungliga Tekniska Högskolan
+ * Copyright (c) 1997 - 2000 Kungliga Tekniska Högskolan
  * (Royal Institute of Technology, Stockholm, Sweden). 
  * All rights reserved. 
  *
@@ -33,36 +33,22 @@
 
 #ifdef HAVE_CONFIG_H
 #include <config.h>
-RCSID("$Id: bits.c,v 1.16 1999/12/02 17:04:57 joda Exp $");
+RCSID("$Id: bits.c,v 1.18 2000/08/27 05:42:46 assar Exp $");
 #endif
 #include <stdio.h>
 #include <string.h>
 #include <stdlib.h>
 #include <ctype.h>
 
-static void
-my_strupr(char *s)
-{
-    char *p = s;
-
-    while(*p){
-	if(islower((unsigned char)*p))
-	    *p = toupper((unsigned char)*p);
-	p++;
-    }	
-}
-
-
 #define BITSIZE(TYPE)						\
 {								\
-    int b = 0; TYPE x = 1, zero = 0; char *pre = "u_";		\
+    int b = 0; TYPE x = 1, zero = 0; char *pre = "u";		\
     char tmp[128], tmp2[128];					\
     while(x){ x <<= 1; b++; if(x < zero) pre=""; }		\
     if(b >= len){						\
         int tabs;						\
 	sprintf(tmp, "%sint%d_t" , pre, len);			\
 	sprintf(tmp2, "typedef %s %s;", #TYPE, tmp);		\
-	my_strupr(tmp);						\
 	tabs = 5 - strlen(tmp2) / 8;				\
         fprintf(f, "%s", tmp2);					\
 	while(tabs-- > 0) fprintf(f, "\t");			\
@@ -71,6 +57,19 @@ my_strupr(char *s)
     }								\
 }
 
+#ifndef HAVE___ATTRIBUTE__
+#define __attribute__(x)
+#endif
+
+static void
+try_signed(FILE *f, int len)  __attribute__ ((unused));
+
+static void
+try_unsigned(FILE *f, int len) __attribute__ ((unused));
+
+static int
+print_bt(FILE *f, int flag) __attribute__ ((unused));
+
 static void
 try_signed(FILE *f, int len)
 {
@@ -132,7 +131,7 @@ int main(int argc, char **argv)
     }
     fprintf(f, "/* %s -- this file was generated for %s by\n", fn, HOST);
     fprintf(f, "   %*s    %s */\n\n", (int)strlen(fn), "", 
-	    "$Id: bits.c,v 1.16 1999/12/02 17:04:57 joda Exp $");
+	    "$Id: bits.c,v 1.18 2000/08/27 05:42:46 assar Exp $");
     fprintf(f, "#ifndef %s\n", hb);
     fprintf(f, "#define %s\n", hb);
     fprintf(f, "\n");
@@ -173,22 +172,42 @@ int main(int argc, char **argv)
 #endif /* HAVE_INT64_T */
 #endif
 
-#ifndef HAVE_U_INT8_T
+#ifndef HAVE_UINT8_T
     flag = print_bt(f, flag);
     try_unsigned (f, 8);
-#endif /* HAVE_INT8_T */
-#ifndef HAVE_U_INT16_T
+#endif /* HAVE_UINT8_T */
+#ifndef HAVE_UINT16_T
     flag = print_bt(f, flag);
     try_unsigned (f, 16);
+#endif /* HAVE_UINT16_T */
+#ifndef HAVE_UINT32_T
+    flag = print_bt(f, flag);
+    try_unsigned (f, 32);
+#endif /* HAVE_UINT32_T */
+#if 0
+#ifndef HAVE_UINT64_T
+    flag = print_bt(f, flag);
+    try_unsigned (f, 64);
+#endif /* HAVE_UINT64_T */
+#endif
+
+#define X(S) fprintf(f, "typedef uint" #S "_t u_int" #S "_t;\n")
+#ifndef HAVE_U_INT8_T
+    flag = print_bt(f, flag);
+    X(8);
+#endif /* HAVE_U_INT8_T */
+#ifndef HAVE_U_INT16_T
+    flag = print_bt(f, flag);
+    X(16);
 #endif /* HAVE_U_INT16_T */
 #ifndef HAVE_U_INT32_T
     flag = print_bt(f, flag);
-    try_unsigned (f, 32);
+    X(32);
 #endif /* HAVE_U_INT32_T */
 #if 0
 #ifndef HAVE_U_INT64_T
     flag = print_bt(f, flag);
-    try_unsigned (f, 64);
+    X(64);
 #endif /* HAVE_U_INT64_T */
 #endif
 
diff --git a/crypto/heimdal/include/config.h.in b/crypto/heimdal/include/config.h.in
index 9707f56..069bc3f 100644
--- a/crypto/heimdal/include/config.h.in
+++ b/crypto/heimdal/include/config.h.in
@@ -1,1102 +1,1201 @@
 /* include/config.h.in.  Generated automatically from configure.in by autoheader.  */
 
-/* Define to empty if the keyword does not work.  */
-#undef const
-
-/* Define to `int' if <sys/types.h> doesn't define.  */
-#undef gid_t
+#ifndef RCSID
+#define RCSID(msg) static /**/const char *const rcsid[] = { (const char *)rcsid, "\100(#)" msg }
+#endif
 
-/* Define as __inline if that's what the C compiler calls it.  */
-#undef inline
+#undef BINDIR 
+#undef LIBDIR
+#undef LIBEXECDIR
+#undef SBINDIR
 
-/* Define to `long' if <sys/types.h> doesn't define.  */
-#undef off_t
+#undef HAVE_INT8_T
+#undef HAVE_INT16_T
+#undef HAVE_INT32_T
+#undef HAVE_INT64_T
+#undef HAVE_U_INT8_T
+#undef HAVE_U_INT16_T
+#undef HAVE_U_INT32_T
+#undef HAVE_U_INT64_T
 
-/* Define to `int' if <sys/types.h> doesn't define.  */
-#undef pid_t
+/* Maximum values on all known systems */
+#define MaxHostNameLen (64+4)
+#define MaxPathLen (1024+4)
 
-/* Define as the return type of signal handlers (int or void).  */
-#undef RETSIGTYPE
 
-/* Define to `unsigned' if <sys/types.h> doesn't define.  */
-#undef size_t
 
-/* Define if you have the ANSI C header files.  */
-#undef STDC_HEADERS
-
-/* Define if you can safely include both <sys/time.h> and <time.h>.  */
-#undef TIME_WITH_SYS_TIME
+/* Define if you want authentication support in telnet. */
+#undef AUTHENTICATION
 
-/* Define if your <sys/time.h> declares struct tm.  */
-#undef TM_IN_SYS_TIME
+/* Define if realloc(NULL) doesn't work. */
+#undef BROKEN_REALLOC
 
-/* Define to `int' if <sys/types.h> doesn't define.  */
-#undef uid_t
+/* Define if you want support for DCE/DFS PAG's. */
+#undef DCE
 
-/* Define if the X Window System is missing or not being used.  */
-#undef X_DISPLAY_MISSING
+/* Define if you want to use DES encryption in telnet. */
+#undef DES_ENCRYPTION
 
-/* Define if lex declares yytext as a char * by default, not a char[].  */
-#undef YYTEXT_POINTER
+/* Define this to enable diagnostics in telnet. */
+#undef DIAGNOSTICS
 
-/* Define if you have the MD4Init function.  */
-#undef HAVE_MD4INIT
+/* Define if you want encryption support in telnet. */
+#undef ENCRYPTION
 
-/* Define if you have the MD4_Init function.  */
-#undef HAVE_MD4_INIT
+/* define if sys/param.h defines the endiness */
+#undef ENDIANESS_IN_SYS_PARAM_H
 
-/* Define if you have the MD5Init function.  */
-#undef HAVE_MD5INIT
+/* Define this if you want support for broken ENV_{VAR,VAL} telnets. */
+#undef ENV_HACK
 
-/* Define if you have the MD5_Init function.  */
-#undef HAVE_MD5_INIT
+/* define if prototype of gethostbyaddr is compatible with struct hostent
+   *gethostbyaddr(const void *, size_t, int) */
+#undef GETHOSTBYADDR_PROTO_COMPATIBLE
 
-/* Define if you have the SHA1Init function.  */
-#undef HAVE_SHA1INIT
+/* define if prototype of gethostbyname is compatible with struct hostent
+   *gethostbyname(const char *) */
+#undef GETHOSTBYNAME_PROTO_COMPATIBLE
 
-/* Define if you have the SHA1_Init function.  */
-#undef HAVE_SHA1_INIT
+/* define if prototype of getservbyname is compatible with struct servent
+   *getservbyname(const char *, const char *) */
+#undef GETSERVBYNAME_PROTO_COMPATIBLE
 
-/* Define if you have the XauFileName function.  */
-#undef HAVE_XAUFILENAME
+/* define if prototype of getsockname is compatible with int getsockname(int,
+   struct sockaddr*, socklen_t*) */
+#undef GETSOCKNAME_PROTO_COMPATIBLE
 
-/* Define if you have the XauReadAuth function.  */
-#undef HAVE_XAUREADAUTH
+/* Define if you have the <arpa/ftp.h> header file. */
+#undef HAVE_ARPA_FTP_H
 
-/* Define if you have the XauWriteAuth function.  */
-#undef HAVE_XAUWRITEAUTH
+/* Define if you have the <arpa/inet.h> header file. */
+#undef HAVE_ARPA_INET_H
 
-/* Define if you have the _getpty function.  */
-#undef HAVE__GETPTY
+/* Define if you have the <arpa/nameser.h> header file. */
+#undef HAVE_ARPA_NAMESER_H
 
-/* Define if you have the _scrsize function.  */
-#undef HAVE__SCRSIZE
+/* Define if you have the <arpa/telnet.h> header file. */
+#undef HAVE_ARPA_TELNET_H
 
-/* Define if you have the asnprintf function.  */
+/* Define if you have the `asnprintf' function. */
 #undef HAVE_ASNPRINTF
 
-/* Define if you have the asprintf function.  */
+/* Define if you have the `asprintf' function. */
 #undef HAVE_ASPRINTF
 
-/* Define if you have the cap_set_proc function.  */
+/* Define if you have the <bind/bitypes.h> header file. */
+#undef HAVE_BIND_BITYPES_H
+
+/* Define if you have the <bsdsetjmp.h> header file. */
+#undef HAVE_BSDSETJMP_H
+
+/* Define if you have the <capability.h> header file. */
+#undef HAVE_CAPABILITY_H
+
+/* Define if you have the `cap_set_proc' function. */
 #undef HAVE_CAP_SET_PROC
 
-/* Define if you have the cgetent function.  */
+/* Define if you have the `cgetent' function. */
 #undef HAVE_CGETENT
 
-/* Define if you have the chown function.  */
+/* Define if you have the `chown' function. */
 #undef HAVE_CHOWN
 
-/* Define if you have the copyhostent function.  */
+/* Define if you have the <config.h> header file. */
+#undef HAVE_CONFIG_H
+
+/* Define if you have the `copyhostent' function. */
 #undef HAVE_COPYHOSTENT
 
-/* Define if you have the crypt function.  */
+/* Define if you have the `crypt' function. */
 #undef HAVE_CRYPT
 
-/* Define if you have the daemon function.  */
+/* Define if you have the <crypt.h> header file. */
+#undef HAVE_CRYPT_H
+
+/* Define if you have the <curses.h> header file. */
+#undef HAVE_CURSES_H
+
+/* Define if you have the `daemon' function. */
 #undef HAVE_DAEMON
 
-/* Define if you have the dbm_firstkey function.  */
+/* Define if you have the `dbm_firstkey' function. */
 #undef HAVE_DBM_FIRSTKEY
 
-/* Define if you have the dbopen function.  */
+/* Define if you have the <dbm.h> header file. */
+#undef HAVE_DBM_H
+
+/* Define if you have the `dbopen' function. */
 #undef HAVE_DBOPEN
 
-/* Define if you have the des_cbc_encrypt function.  */
+/* Define if you have the <db_185.h> header file. */
+#undef HAVE_DB_185_H
+
+/* Define if you have the `db_create' function. */
+#undef HAVE_DB_CREATE
+
+/* Define if you have the <db.h> header file. */
+#undef HAVE_DB_H
+
+/* Define if you have the `des_cbc_encrypt' function. */
 #undef HAVE_DES_CBC_ENCRYPT
 
-/* Define if you have the dlopen function.  */
+/* Define if you have the <dirent.h> header file. */
+#undef HAVE_DIRENT_H
+
+/* Define if you have the <dlfcn.h> header file. */
+#undef HAVE_DLFCN_H
+
+/* Define if you have the `dlopen' function. */
 #undef HAVE_DLOPEN
 
-/* Define if you have the dn_expand function.  */
+/* Define if you have the `dn_expand' function. */
 #undef HAVE_DN_EXPAND
 
-/* Define if you have the el_init function.  */
+/* Define if you have the `el_init' function. */
 #undef HAVE_EL_INIT
 
-/* Define if you have the err function.  */
+/* define if your system declares environ */
+#undef HAVE_ENVIRON_DECLARATION
+
+/* Define if you have the `err' function. */
 #undef HAVE_ERR
 
-/* Define if you have the errx function.  */
+/* Define if you have the <errno.h> header file. */
+#undef HAVE_ERRNO_H
+
+/* Define if you have the `errx' function. */
 #undef HAVE_ERRX
 
-/* Define if you have the fchown function.  */
+/* Define if you have the <err.h> header file. */
+#undef HAVE_ERR_H
+
+/* Define if you have the `fchown' function. */
 #undef HAVE_FCHOWN
 
-/* Define if you have the fcntl function.  */
+/* Define if you have the `fcntl' function. */
 #undef HAVE_FCNTL
 
-/* Define if you have the flock function.  */
+/* Define if you have the <fcntl.h> header file. */
+#undef HAVE_FCNTL_H
+
+/* Define if you have the `flock' function. */
 #undef HAVE_FLOCK
 
-/* Define if you have the fnmatch function.  */
+/* Define if you have the `fnmatch' function. */
 #undef HAVE_FNMATCH
 
-/* Define if you have the freeaddrinfo function.  */
+/* Define if you have the <fnmatch.h> header file. */
+#undef HAVE_FNMATCH_H
+
+/* Define if el_init takes four arguments. */
+#undef HAVE_FOUR_VALUED_EL_INIT
+
+/* define if krb_put_int takes four arguments. */
+#undef HAVE_FOUR_VALUED_KRB_PUT_INT
+
+/* Define if you have the `freeaddrinfo' function. */
 #undef HAVE_FREEADDRINFO
 
-/* Define if you have the freehostent function.  */
+/* Define if you have the `freehostent' function. */
 #undef HAVE_FREEHOSTENT
 
-/* Define if you have the gai_strerror function.  */
+/* Define if you have the `gai_strerror' function. */
 #undef HAVE_GAI_STRERROR
 
-/* Define if you have the getaddrinfo function.  */
+/* Define if you have the <gdbm/ndbm.h> header file. */
+#undef HAVE_GDBM_NDBM_H
+
+/* Define if you have the `getaddrinfo' function. */
 #undef HAVE_GETADDRINFO
 
-/* Define if you have the getcwd function.  */
+/* Define if you have the `getconfattr' function. */
+#undef HAVE_GETCONFATTR
+
+/* Define if you have the `getcwd' function. */
 #undef HAVE_GETCWD
 
-/* Define if you have the getdtablesize function.  */
+/* Define if you have the `getdtablesize' function. */
 #undef HAVE_GETDTABLESIZE
 
-/* Define if you have the getegid function.  */
+/* Define if you have the `getegid' function. */
 #undef HAVE_GETEGID
 
-/* Define if you have the geteuid function.  */
+/* Define if you have the `geteuid' function. */
 #undef HAVE_GETEUID
 
-/* Define if you have the getgid function.  */
+/* Define if you have the `getgid' function. */
 #undef HAVE_GETGID
 
-/* Define if you have the gethostbyname function.  */
+/* Define if you have the `gethostbyname' function. */
 #undef HAVE_GETHOSTBYNAME
 
-/* Define if you have the gethostbyname2 function.  */
+/* Define if you have the `gethostbyname2' function. */
 #undef HAVE_GETHOSTBYNAME2
 
-/* Define if you have the gethostname function.  */
+/* Define if you have the `gethostname' function. */
 #undef HAVE_GETHOSTNAME
 
-/* Define if you have the getipnodebyaddr function.  */
+/* Define if you have the `getifaddrs' function. */
+#undef HAVE_GETIFADDRS
+
+/* Define if you have the `getipnodebyaddr' function. */
 #undef HAVE_GETIPNODEBYADDR
 
-/* Define if you have the getipnodebyname function.  */
+/* Define if you have the `getipnodebyname' function. */
 #undef HAVE_GETIPNODEBYNAME
 
-/* Define if you have the getlogin function.  */
+/* Define if you have the `getlogin' function. */
 #undef HAVE_GETLOGIN
 
-/* Define if you have the getmsg function.  */
+/* Define if you have a working getmsg. */
 #undef HAVE_GETMSG
 
-/* Define if you have the getnameinfo function.  */
+/* Define if you have the `getnameinfo' function. */
 #undef HAVE_GETNAMEINFO
 
-/* Define if you have the getopt function.  */
+/* Define if you have the `getopt' function. */
 #undef HAVE_GETOPT
 
-/* Define if you have the getpwnam_r function.  */
+/* Define if you have the `getpwnam_r' function. */
 #undef HAVE_GETPWNAM_R
 
-/* Define if you have the getrlimit function.  */
+/* Define if you have the `getrlimit' function. */
 #undef HAVE_GETRLIMIT
 
-/* Define if you have the getsockopt function.  */
+/* Define if you have the `getsockopt' function. */
 #undef HAVE_GETSOCKOPT
 
-/* Define if you have the getspnam function.  */
+/* Define if you have the `getspnam' function. */
 #undef HAVE_GETSPNAM
 
-/* Define if you have the gettimeofday function.  */
+/* Define if you have the `gettimeofday' function. */
 #undef HAVE_GETTIMEOFDAY
 
-/* Define if you have the getudbnam function.  */
+/* Define if you have the `getudbnam' function. */
 #undef HAVE_GETUDBNAM
 
-/* Define if you have the getuid function.  */
+/* Define if you have the `getuid' function. */
 #undef HAVE_GETUID
 
-/* Define if you have the getusershell function.  */
+/* Define if you have the `getusershell' function. */
 #undef HAVE_GETUSERSHELL
 
-/* Define if you have the grantpt function.  */
+/* define if you have a glob() that groks GLOB_BRACE, GLOB_NOCHECK,
+   GLOB_QUOTE, and GLOB_TILDE */
+#undef HAVE_GLOB
+
+/* Define if you have the `grantpt' function. */
 #undef HAVE_GRANTPT
 
-/* Define if you have the hstrerror function.  */
+/* Define if you have the <grp.h> header file. */
+#undef HAVE_GRP_H
+
+/* Define if you have the `hstrerror' function. */
 #undef HAVE_HSTRERROR
 
-/* Define if you have the inet_aton function.  */
+/* Define if you have the `h_errlist' variable. */
+#undef HAVE_H_ERRLIST
+
+/* define if your system declares h_errlist */
+#undef HAVE_H_ERRLIST_DECLARATION
+
+/* Define if you have the `h_errno' variable. */
+#undef HAVE_H_ERRNO
+
+/* define if your system declares h_errno */
+#undef HAVE_H_ERRNO_DECLARATION
+
+/* Define if you have the `h_nerr' variable. */
+#undef HAVE_H_NERR
+
+/* define if your system declares h_nerr */
+#undef HAVE_H_NERR_DECLARATION
+
+/* Define if you have the <ifaddrs.h> header file. */
+#undef HAVE_IFADDRS_H
+
+/* Define if you have the `inet_aton' function. */
 #undef HAVE_INET_ATON
 
-/* Define if you have the inet_ntop function.  */
+/* Define if you have the `inet_ntop' function. */
 #undef HAVE_INET_NTOP
 
-/* Define if you have the inet_pton function.  */
+/* Define if you have the `inet_pton' function. */
 #undef HAVE_INET_PTON
 
-/* Define if you have the initgroups function.  */
+/* Define if you have the `initgroups' function. */
 #undef HAVE_INITGROUPS
 
-/* Define if you have the innetgr function.  */
+/* Define if you have the `innetgr' function. */
 #undef HAVE_INNETGR
 
-/* Define if you have the iruserok function.  */
+/* Define if you have the <inttypes.h> header file. */
+#undef HAVE_INTTYPES_H
+
+/* Define if you have the <io.h> header file. */
+#undef HAVE_IO_H
+
+/* Define if you have IPv6. */
+#undef HAVE_IPV6
+
+/* Define if you have the `iruserok' function. */
 #undef HAVE_IRUSEROK
 
-/* Define if you have the krb_disable_debug function.  */
+/* Define if you have the `krb_disable_debug' function. */
 #undef HAVE_KRB_DISABLE_DEBUG
 
-/* Define if you have the krb_enable_debug function.  */
+/* Define if you have the `krb_enable_debug' function. */
 #undef HAVE_KRB_ENABLE_DEBUG
 
-/* Define if you have the krb_get_our_ip_for_realm function.  */
+/* Define if you have the `krb_get_our_ip_for_realm' function. */
 #undef HAVE_KRB_GET_OUR_IP_FOR_REALM
 
-/* Define if you have the logwtmp function.  */
+/* Define if you have the <limits.h> header file. */
+#undef HAVE_LIMITS_H
+
+/* Define if you have the `logwtmp' function. */
 #undef HAVE_LOGWTMP
 
-/* Define if you have the long_long function.  */
+/* Define if the system has the type `long long'. */
 #undef HAVE_LONG_LONG
 
-/* Define if you have the lstat function.  */
+/* Define if you have the `lstat' function. */
 #undef HAVE_LSTAT
 
-/* Define if you have the memmove function.  */
+/* Define if you have the <maillock.h> header file. */
+#undef HAVE_MAILLOCK_H
+
+/* Define if you have the `MD4_Init' function. */
+#undef HAVE_MD4_INIT
+
+/* Define if you have the `MD5_Init' function. */
+#undef HAVE_MD5_INIT
+
+/* Define if you have the `memmove' function. */
 #undef HAVE_MEMMOVE
 
-/* Define if you have the mkstemp function.  */
+/* Define if you have the <memory.h> header file. */
+#undef HAVE_MEMORY_H
+
+/* Define if you have the `mkstemp' function. */
 #undef HAVE_MKSTEMP
 
-/* Define if you have the mktime function.  */
+/* Define if you have the `mktime' function. */
 #undef HAVE_MKTIME
 
-/* Define if you have the ptsname function.  */
-#undef HAVE_PTSNAME
-
-/* Define if you have the putenv function.  */
-#undef HAVE_PUTENV
+/* Define if you have the <ndbm.h> header file. */
+#undef HAVE_NDBM_H
 
-/* Define if you have the rand function.  */
-#undef HAVE_RAND
+/* Define if you have the <netdb.h> header file. */
+#undef HAVE_NETDB_H
 
-/* Define if you have the random function.  */
-#undef HAVE_RANDOM
+/* Define if you have the <netinet6/in6.h> header file. */
+#undef HAVE_NETINET6_IN6_H
 
-/* Define if you have the rcmd function.  */
-#undef HAVE_RCMD
+/* Define if you have the <netinet6/in6_var.h> header file. */
+#undef HAVE_NETINET6_IN6_VAR_H
 
-/* Define if you have the readv function.  */
-#undef HAVE_READV
+/* Define if you have the <netinet/in6.h> header file. */
+#undef HAVE_NETINET_IN6_H
 
-/* Define if you have the recvmsg function.  */
-#undef HAVE_RECVMSG
+/* Define if you have the <netinet/in6_machtypes.h> header file. */
+#undef HAVE_NETINET_IN6_MACHTYPES_H
 
-/* Define if you have the res_search function.  */
-#undef HAVE_RES_SEARCH
+/* Define if you have the <netinet/in6_var.h> header file. */
+#undef HAVE_NETINET_IN6_VAR_H
 
-/* Define if you have the revoke function.  */
-#undef HAVE_REVOKE
+/* Define if you have the <netinet/in.h> header file. */
+#undef HAVE_NETINET_IN_H
 
-/* Define if you have the sa_family_t function.  */
-#undef HAVE_SA_FAMILY_T
+/* Define if you have the <netinet/in_systm.h> header file. */
+#undef HAVE_NETINET_IN_SYSTM_H
 
-/* Define if you have the select function.  */
-#undef HAVE_SELECT
+/* Define if you have the <netinet/ip.h> header file. */
+#undef HAVE_NETINET_IP_H
 
-/* Define if you have the sendmsg function.  */
-#undef HAVE_SENDMSG
+/* Define if you have the <netinet/tcp.h> header file. */
+#undef HAVE_NETINET_TCP_H
 
-/* Define if you have the setegid function.  */
-#undef HAVE_SETEGID
+/* Define if you want to use Netinfo instead of krb5.conf. */
+#undef HAVE_NETINFO
 
-/* Define if you have the setenv function.  */
-#undef HAVE_SETENV
+/* Define if you have the <netinfo/ni.h> header file. */
+#undef HAVE_NETINFO_NI_H
 
-/* Define if you have the seteuid function.  */
-#undef HAVE_SETEUID
+/* Define if you have the <net/if.h> header file. */
+#undef HAVE_NET_IF_H
 
-/* Define if you have the setitimer function.  */
-#undef HAVE_SETITIMER
+/* Define if you have the <openssl/des.h> header file. */
+#undef HAVE_OPENSSL_DES_H
 
-/* Define if you have the setlim function.  */
-#undef HAVE_SETLIM
+/* Define if you have the <openssl/md4.h> header file. */
+#undef HAVE_OPENSSL_MD4_H
 
-/* Define if you have the setlogin function.  */
-#undef HAVE_SETLOGIN
+/* Define if you have the <openssl/md5.h> header file. */
+#undef HAVE_OPENSSL_MD5_H
 
-/* Define if you have the setpcred function.  */
-#undef HAVE_SETPCRED
+/* Define if you have the <openssl/rc4.h> header file. */
+#undef HAVE_OPENSSL_RC4_H
 
-/* Define if you have the setpgid function.  */
-#undef HAVE_SETPGID
+/* Define if you have the <openssl/sha.h> header file. */
+#undef HAVE_OPENSSL_SHA_H
 
-/* Define if you have the setproctitle function.  */
-#undef HAVE_SETPROCTITLE
+/* define if your system declares optarg */
+#undef HAVE_OPTARG_DECLARATION
 
-/* Define if you have the setregid function.  */
-#undef HAVE_SETREGID
+/* define if your system declares opterr */
+#undef HAVE_OPTERR_DECLARATION
 
-/* Define if you have the setresgid function.  */
-#undef HAVE_SETRESGID
+/* define if your system declares optind */
+#undef HAVE_OPTIND_DECLARATION
 
-/* Define if you have the setresuid function.  */
-#undef HAVE_SETRESUID
+/* define if your system declares optopt */
+#undef HAVE_OPTOPT_DECLARATION
 
-/* Define if you have the setreuid function.  */
-#undef HAVE_SETREUID
+/* Define to enable basic OSF C2 support. */
+#undef HAVE_OSFC2
 
-/* Define if you have the setsid function.  */
-#undef HAVE_SETSID
+/* Define if you have the <paths.h> header file. */
+#undef HAVE_PATHS_H
 
-/* Define if you have the setsockopt function.  */
-#undef HAVE_SETSOCKOPT
+/* Define if you have the `pidfile' function. */
+#undef HAVE_PIDFILE
 
-/* Define if you have the setutent function.  */
-#undef HAVE_SETUTENT
+/* Define if you have the <pthread.h> header file. */
+#undef HAVE_PTHREAD_H
 
-/* Define if you have the sgi_getcapabilitybyname function.  */
-#undef HAVE_SGI_GETCAPABILITYBYNAME
+/* Define if you have the `ptsname' function. */
+#undef HAVE_PTSNAME
 
-/* Define if you have the sigaction function.  */
-#undef HAVE_SIGACTION
+/* Define if you have the <pty.h> header file. */
+#undef HAVE_PTY_H
 
-/* Define if you have the socket function.  */
-#undef HAVE_SOCKET
+/* Define if you have the `putenv' function. */
+#undef HAVE_PUTENV
 
-/* Define if you have the socklen_t function.  */
-#undef HAVE_SOCKLEN_T
+/* Define if you have the <pwd.h> header file. */
+#undef HAVE_PWD_H
 
-/* Define if you have the strcasecmp function.  */
-#undef HAVE_STRCASECMP
+/* Define if you have the `rand' function. */
+#undef HAVE_RAND
 
-/* Define if you have the strdup function.  */
-#undef HAVE_STRDUP
+/* Define if you have the `random' function. */
+#undef HAVE_RANDOM
 
-/* Define if you have the strerror function.  */
-#undef HAVE_STRERROR
+/* Define if you have the `RC4' function. */
+#undef HAVE_RC4
 
-/* Define if you have the strftime function.  */
-#undef HAVE_STRFTIME
+/* Define if you have the `rcmd' function. */
+#undef HAVE_RCMD
 
-/* Define if you have the strlcat function.  */
-#undef HAVE_STRLCAT
+/* Define if you have a readline compatible library. */
+#undef HAVE_READLINE
 
-/* Define if you have the strlcpy function.  */
-#undef HAVE_STRLCPY
+/* Define if you have the `readv' function. */
+#undef HAVE_READV
 
-/* Define if you have the strlwr function.  */
-#undef HAVE_STRLWR
+/* Define if you have the `recvmsg' function. */
+#undef HAVE_RECVMSG
 
-/* Define if you have the strncasecmp function.  */
-#undef HAVE_STRNCASECMP
+/* Define if you have the <resolv.h> header file. */
+#undef HAVE_RESOLV_H
 
-/* Define if you have the strndup function.  */
-#undef HAVE_STRNDUP
+/* Define if you have the `res_search' function. */
+#undef HAVE_RES_SEARCH
 
-/* Define if you have the strnlen function.  */
-#undef HAVE_STRNLEN
+/* Define if you have the `revoke' function. */
+#undef HAVE_REVOKE
 
-/* Define if you have the strptime function.  */
-#undef HAVE_STRPTIME
+/* Define if you have the <rpcsvc/dbm.h> header file. */
+#undef HAVE_RPCSVC_DBM_H
 
-/* Define if you have the strsep function.  */
-#undef HAVE_STRSEP
+/* Define if you have the <rpcsvc/ypclnt.h> header file. */
+#undef HAVE_RPCSVC_YPCLNT_H
 
-/* Define if you have the strstr function.  */
-#undef HAVE_STRSTR
+/* Define if you have the <sac.h> header file. */
+#undef HAVE_SAC_H
 
-/* Define if you have the strtok_r function.  */
-#undef HAVE_STRTOK_R
+/* Define if the system has the type `sa_family_t'. */
+#undef HAVE_SA_FAMILY_T
 
-/* Define if you have the struct_addrinfo function.  */
-#undef HAVE_STRUCT_ADDRINFO
+/* Define if you have the <security/pam_modules.h> header file. */
+#undef HAVE_SECURITY_PAM_MODULES_H
 
-/* Define if you have the struct_sockaddr function.  */
-#undef HAVE_STRUCT_SOCKADDR
+/* Define if you have the `select' function. */
+#undef HAVE_SELECT
 
-/* Define if you have the struct_sockaddr_storage function.  */
-#undef HAVE_STRUCT_SOCKADDR_STORAGE
+/* Define if you have the `sendmsg' function. */
+#undef HAVE_SENDMSG
 
-/* Define if you have the strupr function.  */
-#undef HAVE_STRUPR
+/* Define if you have the `setegid' function. */
+#undef HAVE_SETEGID
 
-/* Define if you have the swab function.  */
-#undef HAVE_SWAB
+/* Define if you have the `setenv' function. */
+#undef HAVE_SETENV
 
-/* Define if you have the sysconf function.  */
-#undef HAVE_SYSCONF
+/* Define if you have the `seteuid' function. */
+#undef HAVE_SETEUID
 
-/* Define if you have the sysctl function.  */
-#undef HAVE_SYSCTL
+/* Define if you have the `setitimer' function. */
+#undef HAVE_SETITIMER
 
-/* Define if you have the syslog function.  */
-#undef HAVE_SYSLOG
+/* Define if you have the `setlim' function. */
+#undef HAVE_SETLIM
 
-/* Define if you have the tgetent function.  */
-#undef HAVE_TGETENT
+/* Define if you have the `setlogin' function. */
+#undef HAVE_SETLOGIN
 
-/* Define if you have the timegm function.  */
-#undef HAVE_TIMEGM
+/* Define if you have the `setpcred' function. */
+#undef HAVE_SETPCRED
 
-/* Define if you have the ttyname function.  */
-#undef HAVE_TTYNAME
+/* Define if you have the `setpgid' function. */
+#undef HAVE_SETPGID
 
-/* Define if you have the ttyslot function.  */
-#undef HAVE_TTYSLOT
+/* Define if you have the `setproctitle' function. */
+#undef HAVE_SETPROCTITLE
 
-/* Define if you have the umask function.  */
-#undef HAVE_UMASK
+/* Define if you have the `setregid' function. */
+#undef HAVE_SETREGID
 
-/* Define if you have the uname function.  */
-#undef HAVE_UNAME
+/* Define if you have the `setresgid' function. */
+#undef HAVE_SETRESGID
 
-/* Define if you have the unlockpt function.  */
-#undef HAVE_UNLOCKPT
+/* Define if you have the `setresuid' function. */
+#undef HAVE_SETRESUID
 
-/* Define if you have the unsetenv function.  */
-#undef HAVE_UNSETENV
+/* Define if you have the `setreuid' function. */
+#undef HAVE_SETREUID
 
-/* Define if you have the vasnprintf function.  */
-#undef HAVE_VASNPRINTF
+/* Define if you have the `setsid' function. */
+#undef HAVE_SETSID
 
-/* Define if you have the vasprintf function.  */
-#undef HAVE_VASPRINTF
+/* Define if you have the `setsockopt' function. */
+#undef HAVE_SETSOCKOPT
 
-/* Define if you have the verr function.  */
-#undef HAVE_VERR
+/* Define if you have the `setutent' function. */
+#undef HAVE_SETUTENT
 
-/* Define if you have the verrx function.  */
-#undef HAVE_VERRX
+/* Define if you have the `sgi_getcapabilitybyname' function. */
+#undef HAVE_SGI_GETCAPABILITYBYNAME
 
-/* Define if you have the vhangup function.  */
-#undef HAVE_VHANGUP
+/* Define if you have the <sgtty.h> header file. */
+#undef HAVE_SGTTY_H
 
-/* Define if you have the vsyslog function.  */
-#undef HAVE_VSYSLOG
+/* Define if you have the `SHA1_Init' function. */
+#undef HAVE_SHA1_INIT
 
-/* Define if you have the vwarn function.  */
-#undef HAVE_VWARN
+/* Define if you have the <shadow.h> header file. */
+#undef HAVE_SHADOW_H
 
-/* Define if you have the vwarnx function.  */
-#undef HAVE_VWARNX
+/* Define if you have the <siad.h> header file. */
+#undef HAVE_SIAD_H
 
-/* Define if you have the warn function.  */
-#undef HAVE_WARN
+/* Define if you have the `sigaction' function. */
+#undef HAVE_SIGACTION
 
-/* Define if you have the warnx function.  */
-#undef HAVE_WARNX
+/* Define if you have the <signal.h> header file. */
+#undef HAVE_SIGNAL_H
 
-/* Define if you have the writev function.  */
-#undef HAVE_WRITEV
+/* define if you have a working snprintf */
+#undef HAVE_SNPRINTF
 
-/* Define if you have the yp_get_default_domain function.  */
-#undef HAVE_YP_GET_DEFAULT_DOMAIN
+/* Define if you have the `socket' function. */
+#undef HAVE_SOCKET
 
-/* Define if you have the <arpa/ftp.h> header file.  */
-#undef HAVE_ARPA_FTP_H
+/* Define if the system has the type `socklen_t'. */
+#undef HAVE_SOCKLEN_T
 
-/* Define if you have the <arpa/inet.h> header file.  */
-#undef HAVE_ARPA_INET_H
+/* Define if you have the <standards.h> header file. */
+#undef HAVE_STANDARDS_H
 
-/* Define if you have the <arpa/nameser.h> header file.  */
-#undef HAVE_ARPA_NAMESER_H
+/* Define if you have the <stdlib.h> header file. */
+#undef HAVE_STDLIB_H
 
-/* Define if you have the <arpa/telnet.h> header file.  */
-#undef HAVE_ARPA_TELNET_H
+/* Define if you have the `strcasecmp' function. */
+#undef HAVE_STRCASECMP
 
-/* Define if you have the <bind/bitypes.h> header file.  */
-#undef HAVE_BIND_BITYPES_H
+/* Define if you have the `strdup' function. */
+#undef HAVE_STRDUP
 
-/* Define if you have the <bsdsetjmp.h> header file.  */
-#undef HAVE_BSDSETJMP_H
+/* Define if you have the `strerror' function. */
+#undef HAVE_STRERROR
 
-/* Define if you have the <capability.h> header file.  */
-#undef HAVE_CAPABILITY_H
+/* Define if you have the `strftime' function. */
+#undef HAVE_STRFTIME
 
-/* Define if you have the <crypt.h> header file.  */
-#undef HAVE_CRYPT_H
+/* Define if you have the <strings.h> header file. */
+#undef HAVE_STRINGS_H
 
-/* Define if you have the <curses.h> header file.  */
-#undef HAVE_CURSES_H
+/* Define if you have the <string.h> header file. */
+#undef HAVE_STRING_H
 
-/* Define if you have the <db.h> header file.  */
-#undef HAVE_DB_H
+/* Define if you have the `strlcat' function. */
+#undef HAVE_STRLCAT
 
-/* Define if you have the <db_185.h> header file.  */
-#undef HAVE_DB_185_H
+/* Define if you have the `strlcpy' function. */
+#undef HAVE_STRLCPY
 
-/* Define if you have the <dbm.h> header file.  */
-#undef HAVE_DBM_H
+/* Define if you have the `strlwr' function. */
+#undef HAVE_STRLWR
 
-/* Define if you have the <dirent.h> header file.  */
-#undef HAVE_DIRENT_H
+/* Define if you have the `strncasecmp' function. */
+#undef HAVE_STRNCASECMP
 
-/* Define if you have the <dlfcn.h> header file.  */
-#undef HAVE_DLFCN_H
+/* Define if you have the `strndup' function. */
+#undef HAVE_STRNDUP
 
-/* Define if you have the <err.h> header file.  */
-#undef HAVE_ERR_H
+/* Define if you have the `strnlen' function. */
+#undef HAVE_STRNLEN
 
-/* Define if you have the <errno.h> header file.  */
-#undef HAVE_ERRNO_H
+/* Define if you have the <stropts.h> header file. */
+#undef HAVE_STROPTS_H
 
-/* Define if you have the <fcntl.h> header file.  */
-#undef HAVE_FCNTL_H
+/* Define if you have the `strptime' function. */
+#undef HAVE_STRPTIME
 
-/* Define if you have the <fnmatch.h> header file.  */
-#undef HAVE_FNMATCH_H
+/* Define if you have the `strsep' function. */
+#undef HAVE_STRSEP
 
-/* Define if you have the <grp.h> header file.  */
-#undef HAVE_GRP_H
+/* Define if you have the `strsep_copy' function. */
+#undef HAVE_STRSEP_COPY
 
-/* Define if you have the <inttypes.h> header file.  */
-#undef HAVE_INTTYPES_H
+/* Define if you have the `strstr' function. */
+#undef HAVE_STRSTR
 
-/* Define if you have the <io.h> header file.  */
-#undef HAVE_IO_H
+/* Define if you have the `strsvis' function. */
+#undef HAVE_STRSVIS
 
-/* Define if you have the <limits.h> header file.  */
-#undef HAVE_LIMITS_H
+/* Define if you have the `strtok_r' function. */
+#undef HAVE_STRTOK_R
 
-/* Define if you have the <maillock.h> header file.  */
-#undef HAVE_MAILLOCK_H
+/* Define if the system has the type `struct addrinfo'. */
+#undef HAVE_STRUCT_ADDRINFO
 
-/* Define if you have the <ndbm.h> header file.  */
-#undef HAVE_NDBM_H
+/* Define if the system has the type `struct ifaddrs'. */
+#undef HAVE_STRUCT_IFADDRS
 
-/* Define if you have the <net/if.h> header file.  */
-#undef HAVE_NET_IF_H
+/* Define if the system has the type `struct sockaddr'. */
+#undef HAVE_STRUCT_SOCKADDR
 
-/* Define if you have the <netdb.h> header file.  */
-#undef HAVE_NETDB_H
+/* Define if struct sockaddr has field sa_len. */
+#undef HAVE_STRUCT_SOCKADDR_SA_LEN
 
-/* Define if you have the <netinet/in.h> header file.  */
-#undef HAVE_NETINET_IN_H
+/* Define if the system has the type `struct sockaddr_storage'. */
+#undef HAVE_STRUCT_SOCKADDR_STORAGE
 
-/* Define if you have the <netinet/in6.h> header file.  */
-#undef HAVE_NETINET_IN6_H
+/* define if you have struct spwd */
+#undef HAVE_STRUCT_SPWD
 
-/* Define if you have the <netinet/in6_machtypes.h> header file.  */
-#undef HAVE_NETINET_IN6_MACHTYPES_H
+/* Define if struct tm has field tm_gmtoff. */
+#undef HAVE_STRUCT_TM_TM_GMTOFF
 
-/* Define if you have the <netinet/in6_var.h> header file.  */
-#undef HAVE_NETINET_IN6_VAR_H
+/* Define if struct tm has field tm_zone. */
+#undef HAVE_STRUCT_TM_TM_ZONE
 
-/* Define if you have the <netinet/in_systm.h> header file.  */
-#undef HAVE_NETINET_IN_SYSTM_H
+/* Define if struct utmpx has field ut_exit. */
+#undef HAVE_STRUCT_UTMPX_UT_EXIT
 
-/* Define if you have the <netinet/ip.h> header file.  */
-#undef HAVE_NETINET_IP_H
+/* Define if struct utmpx has field ut_syslen. */
+#undef HAVE_STRUCT_UTMPX_UT_SYSLEN
 
-/* Define if you have the <netinet/tcp.h> header file.  */
-#undef HAVE_NETINET_TCP_H
+/* Define if struct utmp has field ut_addr. */
+#undef HAVE_STRUCT_UTMP_UT_ADDR
 
-/* Define if you have the <netinet6/in6.h> header file.  */
-#undef HAVE_NETINET6_IN6_H
+/* Define if struct utmp has field ut_host. */
+#undef HAVE_STRUCT_UTMP_UT_HOST
 
-/* Define if you have the <netinfo/ni.h> header file.  */
-#undef HAVE_NETINFO_NI_H
+/* Define if struct utmp has field ut_id. */
+#undef HAVE_STRUCT_UTMP_UT_ID
 
-/* Define if you have the <paths.h> header file.  */
-#undef HAVE_PATHS_H
+/* Define if struct utmp has field ut_pid. */
+#undef HAVE_STRUCT_UTMP_UT_PID
 
-/* Define if you have the <pthread.h> header file.  */
-#undef HAVE_PTHREAD_H
+/* Define if struct utmp has field ut_type. */
+#undef HAVE_STRUCT_UTMP_UT_TYPE
 
-/* Define if you have the <pty.h> header file.  */
-#undef HAVE_PTY_H
+/* Define if struct utmp has field ut_user. */
+#undef HAVE_STRUCT_UTMP_UT_USER
 
-/* Define if you have the <pwd.h> header file.  */
-#undef HAVE_PWD_H
+/* define if struct winsize is declared in sys/termios.h */
+#undef HAVE_STRUCT_WINSIZE
 
-/* Define if you have the <resolv.h> header file.  */
-#undef HAVE_RESOLV_H
+/* Define if you have the `strunvis' function. */
+#undef HAVE_STRUNVIS
 
-/* Define if you have the <rpcsvc/dbm.h> header file.  */
-#undef HAVE_RPCSVC_DBM_H
+/* Define if you have the `strupr' function. */
+#undef HAVE_STRUPR
 
-/* Define if you have the <sac.h> header file.  */
-#undef HAVE_SAC_H
+/* Define if you have the `strvis' function. */
+#undef HAVE_STRVIS
 
-/* Define if you have the <security/pam_modules.h> header file.  */
-#undef HAVE_SECURITY_PAM_MODULES_H
+/* Define if you have the `strvisx' function. */
+#undef HAVE_STRVISX
 
-/* Define if you have the <sgtty.h> header file.  */
-#undef HAVE_SGTTY_H
+/* Define if you have the `svis' function. */
+#undef HAVE_SVIS
 
-/* Define if you have the <shadow.h> header file.  */
-#undef HAVE_SHADOW_H
+/* Define if you have the `swab' function. */
+#undef HAVE_SWAB
 
-/* Define if you have the <siad.h> header file.  */
-#undef HAVE_SIAD_H
+/* Define if you have the `sysconf' function. */
+#undef HAVE_SYSCONF
 
-/* Define if you have the <signal.h> header file.  */
-#undef HAVE_SIGNAL_H
+/* Define if you have the `sysctl' function. */
+#undef HAVE_SYSCTL
 
-/* Define if you have the <standards.h> header file.  */
-#undef HAVE_STANDARDS_H
+/* Define if you have the `syslog' function. */
+#undef HAVE_SYSLOG
 
-/* Define if you have the <stropts.h> header file.  */
-#undef HAVE_STROPTS_H
+/* Define if you have the <syslog.h> header file. */
+#undef HAVE_SYSLOG_H
 
-/* Define if you have the <sys/bitypes.h> header file.  */
+/* Define if you have the <sys/bitypes.h> header file. */
 #undef HAVE_SYS_BITYPES_H
 
-/* Define if you have the <sys/capability.h> header file.  */
+/* Define if you have the <sys/capability.h> header file. */
 #undef HAVE_SYS_CAPABILITY_H
 
-/* Define if you have the <sys/category.h> header file.  */
+/* Define if you have the <sys/category.h> header file. */
 #undef HAVE_SYS_CATEGORY_H
 
-/* Define if you have the <sys/file.h> header file.  */
+/* Define if you have the <sys/file.h> header file. */
 #undef HAVE_SYS_FILE_H
 
-/* Define if you have the <sys/filio.h> header file.  */
+/* Define if you have the <sys/filio.h> header file. */
 #undef HAVE_SYS_FILIO_H
 
-/* Define if you have the <sys/ioccom.h> header file.  */
+/* Define if you have the <sys/ioccom.h> header file. */
 #undef HAVE_SYS_IOCCOM_H
 
-/* Define if you have the <sys/ioctl.h> header file.  */
+/* Define if you have the <sys/ioctl.h> header file. */
 #undef HAVE_SYS_IOCTL_H
 
-/* Define if you have the <sys/param.h> header file.  */
+/* Define if you have the <sys/param.h> header file. */
 #undef HAVE_SYS_PARAM_H
 
-/* Define if you have the <sys/proc.h> header file.  */
+/* Define if you have the <sys/proc.h> header file. */
 #undef HAVE_SYS_PROC_H
 
-/* Define if you have the <sys/pty.h> header file.  */
-#undef HAVE_SYS_PTY_H
-
-/* Define if you have the <sys/ptyio.h> header file.  */
+/* Define if you have the <sys/ptyio.h> header file. */
 #undef HAVE_SYS_PTYIO_H
 
-/* Define if you have the <sys/ptyvar.h> header file.  */
+/* Define if you have the <sys/ptyvar.h> header file. */
 #undef HAVE_SYS_PTYVAR_H
 
-/* Define if you have the <sys/resource.h> header file.  */
+/* Define if you have the <sys/pty.h> header file. */
+#undef HAVE_SYS_PTY_H
+
+/* Define if you have the <sys/resource.h> header file. */
 #undef HAVE_SYS_RESOURCE_H
 
-/* Define if you have the <sys/select.h> header file.  */
+/* Define if you have the <sys/select.h> header file. */
 #undef HAVE_SYS_SELECT_H
 
-/* Define if you have the <sys/socket.h> header file.  */
+/* Define if you have the <sys/socket.h> header file. */
 #undef HAVE_SYS_SOCKET_H
 
-/* Define if you have the <sys/sockio.h> header file.  */
+/* Define if you have the <sys/sockio.h> header file. */
 #undef HAVE_SYS_SOCKIO_H
 
-/* Define if you have the <sys/stat.h> header file.  */
+/* Define if you have the <sys/stat.h> header file. */
 #undef HAVE_SYS_STAT_H
 
-/* Define if you have the <sys/str_tty.h> header file.  */
-#undef HAVE_SYS_STR_TTY_H
-
-/* Define if you have the <sys/stream.h> header file.  */
+/* Define if you have the <sys/stream.h> header file. */
 #undef HAVE_SYS_STREAM_H
 
-/* Define if you have the <sys/stropts.h> header file.  */
+/* Define if you have the <sys/stropts.h> header file. */
 #undef HAVE_SYS_STROPTS_H
 
-/* Define if you have the <sys/strtty.h> header file.  */
+/* Define if you have the <sys/strtty.h> header file. */
 #undef HAVE_SYS_STRTTY_H
 
-/* Define if you have the <sys/syscall.h> header file.  */
+/* Define if you have the <sys/str_tty.h> header file. */
+#undef HAVE_SYS_STR_TTY_H
+
+/* Define if you have the <sys/syscall.h> header file. */
 #undef HAVE_SYS_SYSCALL_H
 
-/* Define if you have the <sys/sysctl.h> header file.  */
+/* Define if you have the <sys/sysctl.h> header file. */
 #undef HAVE_SYS_SYSCTL_H
 
-/* Define if you have the <sys/termio.h> header file.  */
+/* Define if you have the <sys/termio.h> header file. */
 #undef HAVE_SYS_TERMIO_H
 
-/* Define if you have the <sys/time.h> header file.  */
-#undef HAVE_SYS_TIME_H
-
-/* Define if you have the <sys/timeb.h> header file.  */
+/* Define if you have the <sys/timeb.h> header file. */
 #undef HAVE_SYS_TIMEB_H
 
-/* Define if you have the <sys/times.h> header file.  */
+/* Define if you have the <sys/times.h> header file. */
 #undef HAVE_SYS_TIMES_H
 
-/* Define if you have the <sys/tty.h> header file.  */
+/* Define if you have the <sys/time.h> header file. */
+#undef HAVE_SYS_TIME_H
+
+/* Define if you have the <sys/tty.h> header file. */
 #undef HAVE_SYS_TTY_H
 
-/* Define if you have the <sys/types.h> header file.  */
+/* Define if you have the <sys/types.h> header file. */
 #undef HAVE_SYS_TYPES_H
 
-/* Define if you have the <sys/uio.h> header file.  */
+/* Define if you have the <sys/uio.h> header file. */
 #undef HAVE_SYS_UIO_H
 
-/* Define if you have the <sys/un.h> header file.  */
+/* Define if you have the <sys/un.h> header file. */
 #undef HAVE_SYS_UN_H
 
-/* Define if you have the <sys/utsname.h> header file.  */
+/* Define if you have the <sys/utsname.h> header file. */
 #undef HAVE_SYS_UTSNAME_H
 
-/* Define if you have the <sys/wait.h> header file.  */
+/* Define if you have the <sys/wait.h> header file. */
 #undef HAVE_SYS_WAIT_H
 
-/* Define if you have the <syslog.h> header file.  */
-#undef HAVE_SYSLOG_H
+/* Define if you have the <termios.h> header file. */
+#undef HAVE_TERMIOS_H
+
+/* Define if you have the <termio.h> header file. */
+#undef HAVE_TERMIO_H
 
-/* Define if you have the <term.h> header file.  */
+/* Define if you have the <term.h> header file. */
 #undef HAVE_TERM_H
 
-/* Define if you have the <termio.h> header file.  */
-#undef HAVE_TERMIO_H
+/* Define if you have the `tgetent' function. */
+#undef HAVE_TGETENT
 
-/* Define if you have the <termios.h> header file.  */
-#undef HAVE_TERMIOS_H
+/* Define if you have the `timegm' function. */
+#undef HAVE_TIMEGM
+
+/* Define if you have the `timezone' variable. */
+#undef HAVE_TIMEZONE
+
+/* define if your system declares timezone */
+#undef HAVE_TIMEZONE_DECLARATION
 
-/* Define if you have the <time.h> header file.  */
+/* Define if you have the <time.h> header file. */
 #undef HAVE_TIME_H
 
-/* Define if you have the <tmpdir.h> header file.  */
+/* Define if you have the <tmpdir.h> header file. */
 #undef HAVE_TMPDIR_H
 
-/* Define if you have the <udb.h> header file.  */
-#undef HAVE_UDB_H
+/* Define if you have the `ttyname' function. */
+#undef HAVE_TTYNAME
 
-/* Define if you have the <unistd.h> header file.  */
-#undef HAVE_UNISTD_H
+/* Define if you have the `ttyslot' function. */
+#undef HAVE_TTYSLOT
 
-/* Define if you have the <util.h> header file.  */
-#undef HAVE_UTIL_H
+/* Define if you have the <udb.h> header file. */
+#undef HAVE_UDB_H
 
-/* Define if you have the <utmp.h> header file.  */
-#undef HAVE_UTMP_H
+/* Define if you have the `umask' function. */
+#undef HAVE_UMASK
 
-/* Define if you have the <utmpx.h> header file.  */
-#undef HAVE_UTMPX_H
+/* Define if you have the `uname' function. */
+#undef HAVE_UNAME
 
-/* Define if you have the X11 library (-lX11).  */
-#undef HAVE_LIBX11
+/* Define if you have the <unistd.h> header file. */
+#undef HAVE_UNISTD_H
 
-/* Define if you have the Xau library (-lXau).  */
-#undef HAVE_LIBXAU
+/* Define if you have the `unlockpt' function. */
+#undef HAVE_UNLOCKPT
 
-/* Define if you have the c_r library (-lc_r).  */
-#undef HAVE_LIBC_R
+/* Define if you have the `unsetenv' function. */
+#undef HAVE_UNSETENV
 
-/* Define if you have the crypt library (-lcrypt).  */
-#undef HAVE_LIBCRYPT
+/* Define if you have the `unvis' function. */
+#undef HAVE_UNVIS
 
-/* Define if you have the crypto library (-lcrypto).  */
-#undef HAVE_LIBCRYPTO
+/* Define if you have the <userconf.h> header file. */
+#undef HAVE_USERCONF_H
 
-/* Define if you have the curses library (-lcurses).  */
-#undef HAVE_LIBCURSES
+/* Define if you have the <usersec.h> header file. */
+#undef HAVE_USERSEC_H
 
-/* Define if you have the des library (-ldes).  */
-#undef HAVE_LIBDES
+/* Define if you have the <util.h> header file. */
+#undef HAVE_UTIL_H
 
-/* Define if you have the dl library (-ldl).  */
-#undef HAVE_LIBDL
+/* Define if you have the <utmpx.h> header file. */
+#undef HAVE_UTMPX_H
 
-/* Define if you have the edit library (-ledit).  */
-#undef HAVE_LIBEDIT
+/* Define if you have the <utmp.h> header file. */
+#undef HAVE_UTMP_H
 
-/* Define if you have the gdbm library (-lgdbm).  */
-#undef HAVE_LIBGDBM
+/* Define if you have the `vasnprintf' function. */
+#undef HAVE_VASNPRINTF
 
-/* Define if you have the inet6 library (-linet6).  */
-#undef HAVE_LIBINET6
+/* Define if you have the `vasprintf' function. */
+#undef HAVE_VASPRINTF
 
-/* Define if you have the ip6 library (-lip6).  */
-#undef HAVE_LIBIP6
+/* Define if you have the `verr' function. */
+#undef HAVE_VERR
 
-/* Define if you have the ncurses library (-lncurses).  */
-#undef HAVE_LIBNCURSES
+/* Define if you have the `verrx' function. */
+#undef HAVE_VERRX
 
-/* Define if you have the ndbm library (-lndbm).  */
-#undef HAVE_LIBNDBM
+/* Define if you have the `vhangup' function. */
+#undef HAVE_VHANGUP
 
-/* Define if you have the nsl library (-lnsl).  */
-#undef HAVE_LIBNSL
+/* Define if you have the `vis' function. */
+#undef HAVE_VIS
 
-/* Define if you have the resolv library (-lresolv).  */
-#undef HAVE_LIBRESOLV
+/* Define if you have the <vis.h> header file. */
+#undef HAVE_VIS_H
 
-/* Define if you have the socket library (-lsocket).  */
-#undef HAVE_LIBSOCKET
+/* define if you have a working vsnprintf */
+#undef HAVE_VSNPRINTF
 
-/* Define if you have the syslog library (-lsyslog).  */
-#undef HAVE_LIBSYSLOG
+/* Define if you have the `vsyslog' function. */
+#undef HAVE_VSYSLOG
 
-/* Define if you have the termcap library (-ltermcap).  */
-#undef HAVE_LIBTERMCAP
+/* Define if you have the `vwarn' function. */
+#undef HAVE_VWARN
 
-/* Define if you have the util library (-lutil).  */
-#undef HAVE_LIBUTIL
+/* Define if you have the `vwarnx' function. */
+#undef HAVE_VWARNX
 
-/* Name of package */
-#undef PACKAGE
+/* Define if you have the `warn' function. */
+#undef HAVE_WARN
 
-/* Version number of package */
-#undef VERSION
+/* Define if you have the `warnx' function. */
+#undef HAVE_WARNX
 
-/* Define to what version of SunOS you are running. */
-#undef SunOS
+/* Define if you have the <winsock.h> header file. */
+#undef HAVE_WINSOCK_H
 
-/* define if your compiler has __attribute__ */
-#undef HAVE___ATTRIBUTE__
+/* Define if you have the `writev' function. */
+#undef HAVE_WRITEV
 
-/* Define if you have the krb4 package. */
-#undef KRB4
+/* define if struct winsize has ws_xpixel */
+#undef HAVE_WS_XPIXEL
 
-/* define if krb_put_int takes four arguments. */
-#undef HAVE_FOUR_VALUED_KRB_PUT_INT
+/* define if struct winsize has ws_ypixel */
+#undef HAVE_WS_YPIXEL
 
-/* Define to one if your krb.h doesn't */
-#undef KRB_VERIFY_SECURE
+/* Define if you have the `XauFileName' function. */
+#undef HAVE_XAUFILENAME
 
-/* Define to two if your krb.h doesn't */
-#undef KRB_VERIFY_SECURE_FAIL
+/* Define if you have the `XauReadAuth' function. */
+#undef HAVE_XAUREADAUTH
 
-/* Define to zero if your krb.h doesn't */
-#undef KRB_VERIFY_NOT_SECURE
+/* Define if you have the `XauWriteAuth' function. */
+#undef HAVE_XAUWRITEAUTH
 
-/* Enable Kerberos 5 support in applications. */
-#undef KRB5
+/* Define if you have the `yp_get_default_domain' function. */
+#undef HAVE_YP_GET_DEFAULT_DOMAIN
 
-/* Define if you want to use the KDC as a kaserver. */
-#undef KASERVER
+/* Define if you have the `_getpty' function. */
+#undef HAVE__GETPTY
 
-/* Define if you want support in hprop for reading kaserver databases */
-#undef KASERVER_DB
+/* Define if you have the `_scrsize' function. */
+#undef HAVE__SCRSIZE
 
-/* Define if you want OTP support in applications. */
-#undef OTP
+/* define if your compiler has __attribute__ */
+#undef HAVE___ATTRIBUTE__
 
-/* Define to enable basic OSF C2 support. */
-#undef HAVE_OSFC2
+/* Define if you have the `__progname' variable. */
+#undef HAVE___PROGNAME
 
-/* Define if you have the readline package. */
-#undef READLINE
+/* define if your system declares __progname */
+#undef HAVE___PROGNAME_DECLARATION
 
 /* Define if you have the hesiod package. */
 #undef HESIOD
 
-/* define if target is big endian */
-#undef WORDS_BIGENDIAN
-
-/* define if sys/param.h defines the endiness */
-#undef ENDIANESS_IN_SYS_PARAM_H
-
-/* Define this to what the type ssize_t should be. */
-#undef ssize_t
-
-/* Define this to what the type mode_t should be. */
-#undef mode_t
-
-/* Define this to what the type sig_atomic_t should be. */
-#undef sig_atomic_t
-
-/* Define if you want to use Netinfo instead of krb5.conf. */
-#undef HAVE_NETINFO
-
-/* Define if you have IPv6. */
-#undef HAVE_IPV6
-
-/* define if you have a working snprintf */
-#undef HAVE_SNPRINTF
-
-/* define if the system is missing a prototype for snprintf() */
-#undef NEED_SNPRINTF_PROTO
-
-/* define if you have a working vsnprintf */
-#undef HAVE_VSNPRINTF
-
-/* define if the system is missing a prototype for vsnprintf() */
-#undef NEED_VSNPRINTF_PROTO
-
-/* define if you have a glob() that groks 
-	GLOB_BRACE, GLOB_NOCHECK, GLOB_QUOTE, and GLOB_TILDE */
-#undef HAVE_GLOB
+/* Define if you want to use the KDC as a kaserver. */
+#undef KASERVER
 
-/* define if the system is missing a prototype for glob() */
-#undef NEED_GLOB_PROTO
+/* Define if you want support in hprop for reading kaserver databases */
+#undef KASERVER_DB
 
-/* Define if getlogin has POSIX flavour (and not BSD). */
-#undef POSIX_GETLOGIN
+/* Define if you have the krb4 package. */
+#undef KRB4
 
-/* Define if getpwnam_r has POSIX flavour. */
-#undef POSIX_GETPWNAM_R
+/* Enable Kerberos 5 support in applications. */
+#undef KRB5
 
-/* Define if signal handlers return void. */
-#undef VOID_RETSIGTYPE
+/* Define if krb_mk_req takes cons char * */
+#undef KRB_MK_REQ_CONST
 
-/* define if the system is missing a prototype for hstrerror() */
-#undef NEED_HSTRERROR_PROTO
+/* Define to zero if your krb.h doesn't */
+#undef KRB_VERIFY_NOT_SECURE
 
-/* define if the system is missing a prototype for asprintf() */
-#undef NEED_ASPRINTF_PROTO
+/* Define to one if your krb.h doesn't */
+#undef KRB_VERIFY_SECURE
 
-/* define if the system is missing a prototype for vasprintf() */
-#undef NEED_VASPRINTF_PROTO
+/* Define to two if your krb.h doesn't */
+#undef KRB_VERIFY_SECURE_FAIL
 
 /* define if the system is missing a prototype for asnprintf() */
 #undef NEED_ASNPRINTF_PROTO
 
-/* define if the system is missing a prototype for vasnprintf() */
-#undef NEED_VASNPRINTF_PROTO
-
-/* define if the system is missing a prototype for setenv() */
-#undef NEED_SETENV_PROTO
+/* define if the system is missing a prototype for asprintf() */
+#undef NEED_ASPRINTF_PROTO
 
-/* define if the system is missing a prototype for unsetenv() */
-#undef NEED_UNSETENV_PROTO
+/* define if the system is missing a prototype for crypt() */
+#undef NEED_CRYPT_PROTO
 
 /* define if the system is missing a prototype for gethostname() */
 #undef NEED_GETHOSTNAME_PROTO
 
-/* define if the system is missing a prototype for mkstemp() */
-#undef NEED_MKSTEMP_PROTO
-
 /* define if the system is missing a prototype for getusershell() */
 #undef NEED_GETUSERSHELL_PROTO
 
-/* define if the system is missing a prototype for inet_aton() */
-#undef NEED_INET_ATON_PROTO
+/* define if the system is missing a prototype for glob() */
+#undef NEED_GLOB_PROTO
 
-/* Define if realloc(NULL) doesn't work. */
-#undef BROKEN_REALLOC
+/* define if the system is missing a prototype for hstrerror() */
+#undef NEED_HSTRERROR_PROTO
 
-/* define if prototype of gethostbyname is compatible with
-	struct hostent *gethostbyname(const char *) */
-#undef GETHOSTBYNAME_PROTO_COMPATIBLE
+/* define if the system is missing a prototype for inet_aton() */
+#undef NEED_INET_ATON_PROTO
 
-/* define if prototype of gethostbyaddr is compatible with
-	struct hostent *gethostbyaddr(const void *, size_t, int) */
-#undef GETHOSTBYADDR_PROTO_COMPATIBLE
+/* define if the system is missing a prototype for mkstemp() */
+#undef NEED_MKSTEMP_PROTO
 
-/* define if prototype of getservbyname is compatible with
-	struct servent *getservbyname(const char *, const char *) */
-#undef GETSERVBYNAME_PROTO_COMPATIBLE
+/* define if the system is missing a prototype for setenv() */
+#undef NEED_SETENV_PROTO
 
-/* define if prototype of openlog is compatible with
-	void openlog(const char *, int, int) */
-#undef OPENLOG_PROTO_COMPATIBLE
+/* define if the system is missing a prototype for snprintf() */
+#undef NEED_SNPRINTF_PROTO
 
-/* define if the system is missing a prototype for crypt() */
-#undef NEED_CRYPT_PROTO
+/* define if the system is missing a prototype for strsep() */
+#undef NEED_STRSEP_PROTO
 
 /* define if the system is missing a prototype for strtok_r() */
 #undef NEED_STRTOK_R_PROTO
 
-/* define if the system is missing a prototype for strsep() */
-#undef NEED_STRSEP_PROTO
-
-/* define if you have h_errno */
-#undef HAVE_H_ERRNO
+/* define if the system is missing a prototype for unsetenv() */
+#undef NEED_UNSETENV_PROTO
 
-/* define if your system declares h_errno */
-#undef HAVE_H_ERRNO_DECLARATION
+/* define if the system is missing a prototype for vasnprintf() */
+#undef NEED_VASNPRINTF_PROTO
 
-/* define if you have h_errlist */
-#undef HAVE_H_ERRLIST
+/* define if the system is missing a prototype for vasprintf() */
+#undef NEED_VASPRINTF_PROTO
 
-/* define if your system declares h_errlist */
-#undef HAVE_H_ERRLIST_DECLARATION
+/* define if the system is missing a prototype for vsnprintf() */
+#undef NEED_VSNPRINTF_PROTO
 
-/* define if you have h_nerr */
-#undef HAVE_H_NERR
+/* Define this to enable old environment option in telnet. */
+#undef OLD_ENVIRON
 
-/* define if your system declares h_nerr */
-#undef HAVE_H_NERR_DECLARATION
+/* Define if you have the openldap package. */
+#undef OPENLDAP
 
-/* define if you have __progname */
-#undef HAVE___PROGNAME
+/* define if prototype of openlog is compatible with void openlog(const char
+   *, int, int) */
+#undef OPENLOG_PROTO_COMPATIBLE
 
-/* define if your system declares __progname */
-#undef HAVE___PROGNAME_DECLARATION
+/* Define if you want OTP support in applications. */
+#undef OTP
 
-/* define if your system declares optarg */
-#undef HAVE_OPTARG_DECLARATION
+/* Name of package */
+#undef PACKAGE
 
-/* define if your system declares optind */
-#undef HAVE_OPTIND_DECLARATION
+/* Define if getlogin has POSIX flavour (and not BSD). */
+#undef POSIX_GETLOGIN
 
-/* define if your system declares opterr */
-#undef HAVE_OPTERR_DECLARATION
+/* Define if getpwnam_r has POSIX flavour. */
+#undef POSIX_GETPWNAM_R
 
-/* define if your system declares optopt */
-#undef HAVE_OPTOPT_DECLARATION
+/* Define if you have the readline package. */
+#undef READLINE
 
-/* define if your system declares environ */
-#undef HAVE_ENVIRON_DECLARATION
+/* Define as the return type of signal handlers (`int' or `void'). */
+#undef RETSIGTYPE
 
-/* Define if struct utmp has field ut_addr. */
-#undef HAVE_STRUCT_UTMP_UT_ADDR
+/* Define if you have the ANSI C header files. */
+#undef STDC_HEADERS
 
-/* Define if struct utmp has field ut_host. */
-#undef HAVE_STRUCT_UTMP_UT_HOST
+/* Define if you have streams ptys. */
+#undef STREAMSPTY
 
-/* Define if struct utmp has field ut_id. */
-#undef HAVE_STRUCT_UTMP_UT_ID
+/* Define to what version of SunOS you are running. */
+#undef SunOS
 
-/* Define if struct utmp has field ut_pid. */
-#undef HAVE_STRUCT_UTMP_UT_PID
+/* Define if you can safely include both <sys/time.h> and <time.h>. */
+#undef TIME_WITH_SYS_TIME
 
-/* Define if struct utmp has field ut_type. */
-#undef HAVE_STRUCT_UTMP_UT_TYPE
+/* Define if your <sys/time.h> declares `struct tm'. */
+#undef TM_IN_SYS_TIME
 
-/* Define if struct utmp has field ut_user. */
-#undef HAVE_STRUCT_UTMP_UT_USER
+/* Version number of package */
+#undef VERSION
 
-/* Define if struct utmpx has field ut_exit. */
-#undef HAVE_STRUCT_UTMPX_UT_EXIT
+/* Define if signal handlers return void. */
+#undef VOID_RETSIGTYPE
 
-/* Define if struct utmpx has field ut_syslen. */
-#undef HAVE_STRUCT_UTMPX_UT_SYSLEN
+/* define if target is big endian */
+#undef WORDS_BIGENDIAN
 
-/* Define if struct tm has field tm_gmtoff. */
-#undef HAVE_STRUCT_TM_TM_GMTOFF
+/* Define if the X Window System is missing or not being used. */
+#undef X_DISPLAY_MISSING
 
-/* Define if struct tm has field tm_zone. */
-#undef HAVE_STRUCT_TM_TM_ZONE
+/* Define if `lex' declares `yytext' as a `char *' by default, not a `char[]'.
+   */
+#undef YYTEXT_POINTER
 
-/* define if you have timezone */
-#undef HAVE_TIMEZONE
+/* Define to empty if `const' does not conform to ANSI C. */
+#undef const
 
-/* define if your system declares timezone */
-#undef HAVE_TIMEZONE_DECLARATION
+/* Define to `int' if <sys/types.h> doesn't define. */
+#undef gid_t
 
-/* define if struct winsize is declared in sys/termios.h */
-#undef HAVE_STRUCT_WINSIZE
+/* Define as `__inline' if that's what the C compiler calls it, or to nothing
+   if it is not supported. */
+#undef inline
 
-/* define if struct winsize has ws_xpixel */
-#undef HAVE_WS_XPIXEL
+/* Define this to what the type mode_t should be. */
+#undef mode_t
 
-/* define if struct winsize has ws_ypixel */
-#undef HAVE_WS_YPIXEL
+/* Define to `long' if <sys/types.h> does not define. */
+#undef off_t
 
-/* define if you have struct spwd */
-#undef HAVE_STRUCT_SPWD
+/* Define to `int' if <sys/types.h> does not define. */
+#undef pid_t
 
-/* Define if struct sockaddr has field sa_len. */
-#undef HAVE_STRUCT_SOCKADDR_SA_LEN
+/* Define this to what the type sig_atomic_t should be. */
+#undef sig_atomic_t
 
-/* Define if el_init takes four arguments. */
-#undef HAVE_FOUR_VALUED_EL_INIT
+/* Define to `unsigned' if <sys/types.h> does not define. */
+#undef size_t
 
-/* Define if you have a readline compatible library. */
-#undef HAVE_READLINE
+/* Define this to what the type ssize_t should be. */
+#undef ssize_t
 
-/* Define if you want authentication support in telnet. */
-#undef AUTHENTICATION
+/* Define to `int' if <sys/types.h> doesn't define. */
+#undef uid_t
 
-/* Define if you want encryption support in telnet. */
-#undef ENCRYPTION
+#ifdef VOID_RETSIGTYPE
+#define SIGRETURN(x) return
+#else
+#define SIGRETURN(x) return (RETSIGTYPE)(x)
+#endif
 
-/* Define if you want to use DES encryption in telnet. */
-#undef DES_ENCRYPTION
+#ifdef BROKEN_REALLOC
+#define realloc(X, Y) isoc_realloc((X), (Y))
+#define isoc_realloc(X, Y) ((X) ? realloc((X), (Y)) : malloc(Y))
+#endif
 
-/* Define this to enable diagnostics in telnet. */
-#undef DIAGNOSTICS
+#if defined(HAVE_FOUR_VALUED_KRB_PUT_INT) || !defined(KRB4)
+#define KRB_PUT_INT(F, T, L, S) krb_put_int((F), (T), (L), (S))
+#else
+#define KRB_PUT_INT(F, T, L, S) krb_put_int((F), (T), (S))
+#endif
 
-/* Define this to enable old environment option in telnet. */
-#undef OLD_ENVIRON
 
-/* Define this if you want support for broken ENV_{VAR,VAL} telnets. */
-#undef ENV_HACK
+#ifdef VOID_RETSIGTYPE
+#define SIGRETURN(x) return
+#else
+#define SIGRETURN(x) return (RETSIGTYPE)(x)
+#endif
 
-/* Define if you have streams ptys. */
-#undef STREAMSPTY
+#ifdef BROKEN_REALLOC
+#define realloc(X, Y) isoc_realloc((X), (Y))
+#define isoc_realloc(X, Y) ((X) ? realloc((X), (Y)) : malloc(Y))
+#endif
 
+#undef BINDIR 
+#undef LIBDIR
+#undef LIBEXECDIR
+#undef SBINDIR
 
 #undef BINDIR 
 #undef LIBDIR
@@ -1111,6 +1210,10 @@
 #undef HAVE_U_INT16_T
 #undef HAVE_U_INT32_T
 #undef HAVE_U_INT64_T
+#undef HAVE_UINT8_T
+#undef HAVE_UINT16_T
+#undef HAVE_UINT32_T
+#undef HAVE_UINT64_T
 
 #if defined(HAVE_FOUR_VALUED_KRB_PUT_INT) || !defined(KRB4)
 #define KRB_PUT_INT(F, T, L, S) krb_put_int((F), (T), (L), (S))
diff --git a/crypto/heimdal/include/kadm5/Makefile.in b/crypto/heimdal/include/kadm5/Makefile.in
index 895c9f5..02f8027 100644
--- a/crypto/heimdal/include/kadm5/Makefile.in
+++ b/crypto/heimdal/include/kadm5/Makefile.in
@@ -1,6 +1,6 @@
-# Makefile.in generated automatically by automake 1.4 from Makefile.am
+# Makefile.in generated automatically by automake 1.4a from Makefile.am
 
-# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
+# Copyright (C) 1994, 1995-9, 2000 Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -10,15 +10,6 @@
 # even the implied warranty of MERCHANTABILITY or FITNESS FOR A
 # PARTICULAR PURPOSE.
 
-# $Id: Makefile.am,v 1.6 1999/03/20 13:58:17 joda Exp $
-
-
-# $Id: Makefile.am.common,v 1.3 1999/04/01 14:58:43 joda Exp $
-
-
-# $Id: Makefile.am.common,v 1.13 1999/11/01 03:19:58 assar Exp $
-
-
 SHELL = @SHELL@
 
 srcdir = @srcdir@
@@ -40,8 +31,6 @@ mandir = @mandir@
 includedir = @includedir@
 oldincludedir = /usr/include
 
-DESTDIR =
-
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
@@ -54,9 +43,10 @@ AUTOMAKE = @AUTOMAKE@
 AUTOHEADER = @AUTOHEADER@
 
 INSTALL = @INSTALL@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS)
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_FLAG =
 transform = @program_transform_name@
 
 NORMAL_INSTALL = :
@@ -65,26 +55,39 @@ POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
+
+@SET_MAKE@
 host_alias = @host_alias@
 host_triplet = @host@
-AFS_EXTRA_LD = @AFS_EXTRA_LD@
 AIX_EXTRA_KAFS = @AIX_EXTRA_KAFS@
+AMDEP = @AMDEP@
+AMTAR = @AMTAR@
+AS = @AS@
 AWK = @AWK@
 CANONICAL_HOST = @CANONICAL_HOST@
 CATMAN = @CATMAN@
 CATMANEXT = @CATMANEXT@
 CC = @CC@
+CPP = @CPP@
+CXX = @CXX@
+CXXCPP = @CXXCPP@
 DBLIB = @DBLIB@
+DEPDIR = @DEPDIR@
+DIR_des = @DIR_des@
+DIR_roken = @DIR_roken@
+DLLTOOL = @DLLTOOL@
 EXEEXT = @EXEEXT@
 EXTRA_LIB45 = @EXTRA_LIB45@
 GROFF = @GROFF@
+INCLUDES_roken = @INCLUDES_roken@
 INCLUDE_ = @INCLUDE_@
-LD = @LD@
 LEX = @LEX@
 LIBOBJS = @LIBOBJS@
 LIBTOOL = @LIBTOOL@
 LIB_ = @LIB_@
 LIB_AUTH_SUBDIRS = @LIB_AUTH_SUBDIRS@
+LIB_des = @LIB_des@
+LIB_des_appl = @LIB_des_appl@
 LIB_kdb = @LIB_kdb@
 LIB_otp = @LIB_otp@
 LIB_roken = @LIB_roken@
@@ -92,31 +95,43 @@ LIB_security = @LIB_security@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
 MAKEINFO = @MAKEINFO@
-MAKE_X_PROGS_BIN_PROGS = @MAKE_X_PROGS_BIN_PROGS@
-MAKE_X_PROGS_BIN_SCRPTS = @MAKE_X_PROGS_BIN_SCRPTS@
-MAKE_X_PROGS_LIBEXEC_PROGS = @MAKE_X_PROGS_LIBEXEC_PROGS@
 NEED_WRITEAUTH_FALSE = @NEED_WRITEAUTH_FALSE@
 NEED_WRITEAUTH_TRUE = @NEED_WRITEAUTH_TRUE@
-NM = @NM@
 NROFF = @NROFF@
+OBJDUMP = @OBJDUMP@
 OBJEXT = @OBJEXT@
 PACKAGE = @PACKAGE@
 RANLIB = @RANLIB@
+STRIP = @STRIP@
 VERSION = @VERSION@
 VOID_RETSIGTYPE = @VOID_RETSIGTYPE@
 WFLAGS = @WFLAGS@
 WFLAGS_NOIMPLICITINT = @WFLAGS_NOIMPLICITINT@
 WFLAGS_NOUNUSED = @WFLAGS_NOUNUSED@
 YACC = @YACC@
+dpagaix_CFLAGS = @dpagaix_CFLAGS@
+dpagaix_LDADD = @dpagaix_LDADD@
+install_sh = @install_sh@
+
+# $Id: Makefile.am,v 1.6 1999/03/20 13:58:17 joda Exp $
+
+
+# $Id: Makefile.am.common,v 1.3 1999/04/01 14:58:43 joda Exp $
+
+
+# $Id: Makefile.am.common,v 1.23 2000/12/05 09:11:09 joda Exp $
+
 
 AUTOMAKE_OPTIONS = foreign no-dependencies
 
 SUFFIXES = .et .h .1 .3 .5 .8 .cat1 .cat3 .cat5 .cat8 .x
 
-INCLUDES = -I$(top_builddir)/include
+INCLUDES = -I$(top_builddir)/include $(INCLUDES_roken)
 
 AM_CFLAGS =  $(WFLAGS)
 
+CP = cp
+
 COMPILE_ET = $(top_builddir)/lib/com_err/compile_et
 
 buildinclude = $(top_builddir)/include
@@ -136,6 +151,7 @@ LIB_getsockopt = @LIB_getsockopt@
 LIB_logout = @LIB_logout@
 LIB_logwtmp = @LIB_logwtmp@
 LIB_odm_initialize = @LIB_odm_initialize@
+LIB_pidfile = @LIB_pidfile@
 LIB_readline = @LIB_readline@
 LIB_res_search = @LIB_res_search@
 LIB_setpcred = @LIB_setpcred@
@@ -144,6 +160,8 @@ LIB_socket = @LIB_socket@
 LIB_syslog = @LIB_syslog@
 LIB_tgetent = @LIB_tgetent@
 
+LIBS = @LIBS@
+
 HESIODLIB = @HESIODLIB@
 HESIODINCLUDE = @HESIODINCLUDE@
 INCLUDE_hesiod = @INCLUDE_hesiod@
@@ -152,28 +170,25 @@ LIB_hesiod = @LIB_hesiod@
 INCLUDE_krb4 = @INCLUDE_krb4@
 LIB_krb4 = @LIB_krb4@
 
+INCLUDE_openldap = @INCLUDE_openldap@
+LIB_openldap = @LIB_openldap@
+
 INCLUDE_readline = @INCLUDE_readline@
 
 LEXLIB = @LEXLIB@
 
-cat1dir = $(mandir)/cat1
-cat3dir = $(mandir)/cat3
-cat5dir = $(mandir)/cat5
-cat8dir = $(mandir)/cat8
-
-MANRX = \(.*\)\.\([0-9]\)
-CATSUFFIX = @CATSUFFIX@
-
 NROFF_MAN = groff -mandoc -Tascii
 
-@KRB4_TRUE@LIB_kafs = $(top_builddir)/lib/kafs/libkafs.la $(AIX_EXTRA_KAFS)
+@KRB4_TRUE@LIB_kafs = @KRB4_TRUE@$(top_builddir)/lib/kafs/libkafs.la $(AIX_EXTRA_KAFS)
 
-@KRB5_TRUE@LIB_krb5 = $(top_builddir)/lib/krb5/libkrb5.la 	$(top_builddir)/lib/asn1/libasn1.la
-@KRB5_TRUE@LIB_gssapi = $(top_builddir)/lib/gssapi/libgssapi.la
+@KRB5_TRUE@LIB_krb5 = @KRB5_TRUE@$(top_builddir)/lib/krb5/libkrb5.la \
+@KRB5_TRUE@	$(top_builddir)/lib/asn1/libasn1.la
+@KRB5_TRUE@LIB_gssapi = @KRB5_TRUE@$(top_builddir)/lib/gssapi/libgssapi.la
 
 CHECK_LOCAL = $(PROGRAMS)
 
 CLEANFILES = admin.h kadm5_err.h private.h
+subdir = include/kadm5
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = ../../include/config.h
 CONFIG_CLEAN_FILES = 
@@ -181,13 +196,14 @@ CFLAGS = @CFLAGS@
 COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
 LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
 CCLD = $(CC)
-LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@
+LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+DIST_SOURCES = 
+depcomp = 
 DIST_COMMON =  Makefile.am Makefile.in
 
 
-DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 
-TAR = tar
 GZIP_ENV = --best
 all: all-redirect
 .SUFFIXES:
@@ -205,17 +221,16 @@ TAGS:
 
 distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
 
-subdir = include/kadm5
-
 distdir: $(DISTFILES)
 	@for file in $(DISTFILES); do \
 	  d=$(srcdir); \
 	  if test -d $$d/$$file; then \
-	    cp -pr $$/$$file $(distdir)/$$file; \
+	    cp -pR $$d/$$file $(distdir) \
+	    || exit 1; \
 	  else \
 	    test -f $(distdir)/$$file \
-	    || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
-	    || cp -p $$d/$$file $(distdir)/$$file || :; \
+	    || cp -p $$d/$$file $(distdir)/$$file \
+	    || exit 1; \
 	  fi; \
 	done
 	$(MAKE) $(AM_MAKEFLAGS) top_distdir="$(top_distdir)" distdir="$(distdir)" dist-hook
@@ -244,7 +259,7 @@ uninstall: uninstall-am
 all-am: Makefile all-local
 all-redirect: all-am
 install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_STRIP_FLAG=-s install
 installdirs:
 
 
@@ -258,6 +273,7 @@ distclean-generic:
 	-rm -f config.cache config.log stamp-h stamp-h[0-9]*
 
 maintainer-clean-generic:
+	-rm -f Makefile.in
 mostlyclean-am:  mostlyclean-generic
 
 mostlyclean: mostlyclean-am
@@ -280,8 +296,8 @@ maintainer-clean: maintainer-clean-am
 .PHONY: tags distdir info-am info dvi-am dvi check-local check check-am \
 installcheck-am installcheck install-exec-am install-exec \
 install-data-local install-data-am install-data install-am install \
-uninstall-am uninstall all-local all-redirect all-am all installdirs \
-mostlyclean-generic distclean-generic clean-generic \
+uninstall-am uninstall all-local all-redirect all-am all install-strip \
+installdirs mostlyclean-generic distclean-generic clean-generic \
 maintainer-clean-generic clean mostlyclean distclean maintainer-clean
 
 
@@ -290,7 +306,10 @@ install-suid-programs:
 	for file in $$foo; do \
 	x=$(DESTDIR)$(bindir)/$$file; \
 	if chown 0:0 $$x && chmod u+s $$x; then :; else \
-	chmod 0 $$x; fi; done
+	echo "*"; \
+	echo "* Failed to install $$x setuid root"; \
+	echo "*"; \
+	fi; done
 
 install-exec-hook: install-suid-programs
 
@@ -302,8 +321,8 @@ install-build-headers:: $(include_HEADERS) $(build_HEADERZ)
 		else file="$$f"; fi; \
 		if cmp -s  $$file $(buildinclude)/$$f 2> /dev/null ; then \
 		: ; else \
-			echo " cp $$file $(buildinclude)/$$f"; \
-			cp $$file $(buildinclude)/$$f; \
+			echo " $(CP) $$file $(buildinclude)/$$f"; \
+			$(CP) $$file $(buildinclude)/$$f; \
 		fi ; \
 	done
 
@@ -372,87 +391,8 @@ dist-cat8-mans:
 
 dist-hook: dist-cat1-mans dist-cat3-mans dist-cat5-mans dist-cat8-mans
 
-install-cat1-mans:
-	@ext=1;\
-	foo='$(man1_MANS)'; \
-	bar='$(man_MANS)'; \
-	for i in $$bar; do \
-	case $$i in \
-	*.1) foo="$$foo $$i";; \
-	esac; done; \
-	if test "$$foo"; then \
-		$(mkinstalldirs) $(DESTDIR)$(cat1dir); \
-		for x in $$foo; do \
-			f=`echo $$x | sed 's/\.[^.]*$$/.cat1/'`; \
-			if test -f "$(srcdir)/$$f"; then \
-				b=`echo $$x | sed 's!$(MANRX)!\1!'`; \
-				echo "$(INSTALL_DATA) $(srcdir)/$$f $(DESTDIR)$(cat1dir)/$$b.$(CATSUFFIX)";\
-				$(INSTALL_DATA) $(srcdir)/$$g $(DESTDIR)$(cat1dir)/$$b.$(CATSUFFIX);\
-			 fi; \
-		done ;\
-	fi
-
-install-cat3-mans:
-	@ext=3;\
-	foo='$(man3_MANS)'; \
-	bar='$(man_MANS)'; \
-	for i in $$bar; do \
-	case $$i in \
-	*.3) foo="$$foo $$i";; \
-	esac; done; \
-	if test "$$foo"; then \
-		$(mkinstalldirs) $(DESTDIR)$(cat3dir); \
-		for x in $$foo; do \
-			f=`echo $$x | sed 's/\.[^.]*$$/.cat3/'`; \
-			if test -f "$(srcdir)/$$f"; then \
-				b=`echo $$x | sed 's!$(MANRX)!\1!'`; \
-				echo "$(INSTALL_DATA) $(srcdir)/$$f $(DESTDIR)$(cat3dir)/$$b.$(CATSUFFIX)";\
-				$(INSTALL_DATA) $(srcdir)/$$g $(DESTDIR)$(cat3dir)/$$b.$(CATSUFFIX);\
-			 fi; \
-		done ;\
-	fi
-
-install-cat5-mans:
-	@ext=5;\
-	foo='$(man5_MANS)'; \
-	bar='$(man_MANS)'; \
-	for i in $$bar; do \
-	case $$i in \
-	*.5) foo="$$foo $$i";; \
-	esac; done; \
-	if test "$$foo"; then \
-		$(mkinstalldirs) $(DESTDIR)$(cat5dir); \
-		for x in $$foo; do \
-			f=`echo $$x | sed 's/\.[^.]*$$/.cat5/'`; \
-			if test -f "$(srcdir)/$$f"; then \
-				b=`echo $$x | sed 's!$(MANRX)!\1!'`; \
-				echo "$(INSTALL_DATA) $(srcdir)/$$f $(DESTDIR)$(cat5dir)/$$b.$(CATSUFFIX)";\
-				$(INSTALL_DATA) $(srcdir)/$$g $(DESTDIR)$(cat5dir)/$$b.$(CATSUFFIX);\
-			 fi; \
-		done ;\
-	fi
-
-install-cat8-mans:
-	@ext=8;\
-	foo='$(man8_MANS)'; \
-	bar='$(man_MANS)'; \
-	for i in $$bar; do \
-	case $$i in \
-	*.8) foo="$$foo $$i";; \
-	esac; done; \
-	if test "$$foo"; then \
-		$(mkinstalldirs) $(DESTDIR)$(cat8dir); \
-		for x in $$foo; do \
-			f=`echo $$x | sed 's/\.[^.]*$$/.cat8/'`; \
-			if test -f "$(srcdir)/$$f"; then \
-				b=`echo $$x | sed 's!$(MANRX)!\1!'`; \
-				echo "$(INSTALL_DATA) $(srcdir)/$$f $(DESTDIR)$(cat8dir)/$$b.$(CATSUFFIX)";\
-				$(INSTALL_DATA) $(srcdir)/$$g $(DESTDIR)$(cat8dir)/$$b.$(CATSUFFIX);\
-			 fi; \
-		done ;\
-	fi
-
-install-cat-mans: install-cat1-mans install-cat3-mans install-cat5-mans install-cat8-mans
+install-cat-mans:
+	$(SHELL) $(top_srcdir)/cf/install-catman.sh "$(INSTALL_DATA)" "$(mkinstalldirs)" "$(srcdir)" "$(DESTDIR)$(mandir)" '$(CATMANEXT)' $(man_MANS) $(man1_MANS) $(man3_MANS) $(man5_MANS) $(man8_MANS)
 
 install-data-local: install-cat-mans